github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5028 from Iceber/runtime-spec

Browse Source 
oci: fix the file mode of the device
This commit is contained in:
Phil Estes 2021-02-22 09:25:56 -05:00 committed by GitHub
commit 08d765af95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oci/spec_opts_linux.go
View File

@ -108,7 +108,7 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
case mode&unix.S_IFCHR == unix.S_IFCHR: case mode&unix.S_IFCHR == unix.S_IFCHR:
devType = "c" devType = "c"
} }
fm := os.FileMode(mode) fm := os.FileMode(mode &^ unix.S_IFMT)
return &specs.LinuxDevice{ return &specs.LinuxDevice{
Type: devType, Type: devType,
Path: path, Path: path,

2
oci/spec_opts_unix.go
View File

@ -107,7 +107,7 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
case mode&unix.S_IFCHR == unix.S_IFCHR: case mode&unix.S_IFCHR == unix.S_IFCHR:
devType = "c" devType = "c"
} }
fm := os.FileMode(mode) fm := os.FileMode(mode &^ unix.S_IFMT)
return &specs.LinuxDevice{ return &specs.LinuxDevice{
Type: devType, Type: devType,
Path: path, Path: path,