oci: fix the file mode of the device

Iceber · Iceber · commit d08aa4b6811e · 2021-02-10T16:37:12.000+08:00
Signed-off-by: Iceber Gu &lt;wei.cai-nat@daocloud.io&gt;
diff --git a/oci/spec_opts_linux.go b/oci/spec_opts_linux.go
@@ -108,7 +108,7 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
 	case mode&unix.S_IFCHR == unix.S_IFCHR:
 		devType = "c"
 	}
-	fm := os.FileMode(mode)
+	fm := os.FileMode(mode &^ unix.S_IFMT)
 	return &specs.LinuxDevice{
 		Type:     devType,
 		Path:     path,
diff --git a/oci/spec_opts_unix.go b/oci/spec_opts_unix.go
@@ -107,7 +107,7 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
 	case mode&unix.S_IFCHR == unix.S_IFCHR:
 		devType = "c"
 	}
-	fm := os.FileMode(mode)
+	fm := os.FileMode(mode &^ unix.S_IFMT)
 	return &specs.LinuxDevice{
 		Type:     devType,
 		Path:     path,

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {`
`108`	`108`	`case mode&unix.S_IFCHR == unix.S_IFCHR:`
`109`	`109`	`devType = "c"`
`110`	`110`	`}`
`111`		`- fm := os.FileMode(mode)`
	`111`	`+ fm := os.FileMode(mode &^ unix.S_IFMT)`
`112`	`112`	`return &specs.LinuxDevice{`
`113`	`113`	`Type: devType,`
`114`	`114`	`Path: path,`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {`
`107`	`107`	`case mode&unix.S_IFCHR == unix.S_IFCHR:`
`108`	`108`	`devType = "c"`
`109`	`109`	`}`
`110`		`- fm := os.FileMode(mode)`
	`110`	`+ fm := os.FileMode(mode &^ unix.S_IFMT)`
`111`	`111`	`return &specs.LinuxDevice{`
`112`	`112`	`Type: devType,`
`113`	`113`	`Path: path,`