diff options
| -rw-r--r-- | daemon/oci_linux.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index 2577dca99a..1510f777a2 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -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) { |