Merge pull request #1234 from Random-Liu/update-containerd-to-fix-race

Update containerd to fix panic caused by race condition.

vendor.conf

@@ -40,7 +40,7 @@ github.com/containerd/ttrpc 1fb3814edf44a76e0ccf503decf726d994919a9a
 github.com/containerd/go-runc 9007c2405372fe28918845901a3276c0915689a1
 github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
 github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
-github.com/containerd/containerd 5222236c1b57d055362dbc413d042ab56427270a
+github.com/containerd/containerd a3a30635ef713b544ea7feff0d12a768fd1ed636
 github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
 github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9

vendor/github.com/containerd/containerd/namespaces/ttrpc.go

@@ -27,10 +27,20 @@ const (
 	TTRPCHeader = "containerd-namespace-ttrpc"
 )
 
+func copyMetadata(src ttrpc.MD) ttrpc.MD {
+	md := ttrpc.MD{}
+	for k, v := range src {
+		md[k] = append(md[k], v...)
+	}
+	return md
+}
+
 func withTTRPCNamespaceHeader(ctx context.Context, namespace string) context.Context {
 	md, ok := ttrpc.GetMetadata(ctx)
 	if !ok {
 		md = ttrpc.MD{}
+	} else {
+		md = copyMetadata(md)
 	}
 	md.Set(TTRPCHeader, namespace)
 	return ttrpc.WithMetadata(ctx, md)

vendor/github.com/containerd/containerd/oci/spec_opts_linux.go

@@ -32,7 +32,8 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
 	}
 
 	var (
-		devNumber = stat.Rdev
+		// The type is 32bit on mips.
+		devNumber = uint64(stat.Rdev) // nolint: unconvert
 		major     = unix.Major(devNumber)
 		minor     = unix.Minor(devNumber)
 	)