Merge pull request #3779 from AkihiroSuda/disable-mknod00-in-userns-1.3

estesp · web-flow · commit d6f0c29b1b0c · 2019-10-25T07:44:39.000-04:00
[release/1.3] apply: use naive applier when running in UserNS
diff --git a/diff/apply/apply_linux.go b/diff/apply/apply_linux.go
@@ -26,12 +26,18 @@ import (
 	"github.com/containerd/containerd/archive"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/mount"
+	"github.com/opencontainers/runc/libcontainer/system"
 	"github.com/pkg/errors"
 )
 
 func apply(ctx context.Context, mounts []mount.Mount, r io.Reader) error {
 	switch {
 	case len(mounts) == 1 && mounts[0].Type == "overlay":
+		// OverlayConvertWhiteout (mknod c 0 0) doesn't work in userns.
+		// https://github.com/containerd/containerd/issues/3762
+		if system.RunningInUserNS() {
+			break
+		}
 		path, parents, err := getOverlayPath(mounts[0].Options)
 		if err != nil {
 			if errdefs.IsInvalidArgument(err) {
