diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-06-12 18:47:27 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-27 14:07:17 +0000 |
| commit | 20862c9746e9f0c4ec37e9d9e914f02a82acfb60 (patch) | |
| tree | ee74c4e1a849553abad71a9de262d0ce92b478de | |
| parent | 4415bad6fe15d3a94fc729e5200d694d17151238 (diff) | |
| download | podman-20862c9746e9f0c4ec37e9d9e914f02a82acfb60.tar.gz podman-20862c9746e9f0c4ec37e9d9e914f02a82acfb60.tar.bz2 podman-20862c9746e9f0c4ec37e9d9e914f02a82acfb60.zip | |
rootless: do not configure additional groups
Additional groups are not allowed in an userNS.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes: #936
Approved by: rhatdan
| -rw-r--r-- | libpod/container_internal.go | 2 | ||||
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 3d94fa871..9d5335780 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1286,7 +1286,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { } // Look up and add groups the user belongs to, if a group wasn't directly specified - if !strings.Contains(c.config.User, ":") { + if !rootless.IsRootless() && !strings.Contains(c.config.User, ":") { groups, err := chrootuser.GetAdditionalGroupsForUser(c.state.Mountpoint, uint64(g.Spec().Process.User.UID)) if err != nil && errors.Cause(err) != chrootuser.ErrNoSuchUser { return nil, err diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index f107af7c7..163f46052 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -66,6 +66,8 @@ get_cmd_line_args (pid_t pid) argc++; argv = malloc (sizeof (char *) * (argc + 1)); + if (argv == NULL) + return NULL; argc = 0; argv[argc++] = buffer; |