瀏覽代碼

Fix FIFO, sockets and device files when run in user NS

commit 617c352e9225 "Don't create devices if in a user namespace"

introduced check, which meant to skip mknod operation when run
in user namespace, but instread skipped FIFO and socket files
copy.

Signed-off-by: Maxim Ivanov <ivanov.maxim@gmail.com>
Maxim Ivanov 7 年之前
父節點
當前提交
6f084f2929
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      daemon/graphdriver/copy/copy.go

+ 4 - 4
daemon/graphdriver/copy/copy.go

@@ -189,15 +189,15 @@ func DirCopy(srcDir, dstDir string, copyMode Mode, copyXattrs bool) error {
 		case os.ModeNamedPipe:
 		case os.ModeNamedPipe:
 			fallthrough
 			fallthrough
 		case os.ModeSocket:
 		case os.ModeSocket:
-			if rsystem.RunningInUserNS() {
-				// cannot create a device if running in user namespace
-				return nil
-			}
 			if err := unix.Mkfifo(dstPath, stat.Mode); err != nil {
 			if err := unix.Mkfifo(dstPath, stat.Mode); err != nil {
 				return err
 				return err
 			}
 			}
 
 
 		case os.ModeDevice:
 		case os.ModeDevice:
+			if rsystem.RunningInUserNS() {
+				// cannot create a device if running in user namespace
+				return nil
+			}
 			if err := unix.Mknod(dstPath, stat.Mode, int(stat.Rdev)); err != nil {
 			if err := unix.Mknod(dstPath, stat.Mode, int(stat.Rdev)); err != nil {
 				return err
 				return err
 			}
 			}