InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41293 from thaJeztah/19.03_backport_fix_getexecuser

Browse Source 
[19.03 backport] oci: correctly use user.GetExecUser interface
This commit is contained in:
Tianon Gravi
2020-09-25 18:35:14 -07:00
committed by GitHub
parent 705762f23c 83baeafc3c
commit 88623e101c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/oci_linux.go
View File

@@ -157,7 +157,14 @@ func readUserFile(c *container.Container, p string) (io.ReadCloser, error) {
if err != nil {
return nil, err
}
return os.Open(fp)
fh, err := os.Open(fp)
if err != nil {
// This is needed because a nil *os.File is different to a nil
// io.ReadCloser and this causes GetExecUser to not detect that the
// container file is missing.
return nil, err
}
return fh, nil
}
func getUser(c *container.Container, username string) (uint32, uint32, []uint32, error) {