Skip to content

Commit

Permalink
Merge pull request containers#1321 from giuseppe/create-bind-mount-be…
Browse files Browse the repository at this point in the history
…fore-setgroups-if-in-userns

linux: open mounts before setgroups if in a userns
  • Loading branch information
flouthoc committed Oct 10, 2023
2 parents dd52246 + 122f8ae commit 75009ce
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/libcrun/linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -4068,6 +4068,18 @@ prepare_and_send_mount_mounts (libcrun_container_t *container, pid_t pid, int sy
if (def->mounts_len == 0)
return 0;

if (! has_userns)
{
int is_in_userns;

is_in_userns = check_running_in_user_namespace (err);
if (UNLIKELY (is_in_userns < 0))
return is_in_userns;

if (is_in_userns > 0)
has_userns = true;
}

mount_fds = make_libcrun_fd_map (def->mounts_len);

for (i = 0; i < def->mounts_len; i++)
Expand Down

0 comments on commit 75009ce

Please sign in to comment.