Skip to content

linux: Enter specified cgroup namespace #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flouthoc merged 1 commit into from
Nov 20, 2021
Merged

linux: Enter specified cgroup namespace #781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/libcrun/linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ struct private_data_s
namespaces are available. */
int unshare_flags;

#if CLONE_NEWCGROUP
int unshare_cgroupns;
#endif

char *host_notify_socket_path;
char *container_notify_socket_path;
bool mount_dev_from_host;
Expand Down Expand Up @@ -2329,7 +2333,7 @@ int
libcrun_container_enter_cgroup_ns (libcrun_container_t *container, libcrun_error_t *err)
{
#if CLONE_NEWCGROUP
if (get_private_data (container)->unshare_flags & CLONE_NEWCGROUP)
if (get_private_data (container)->unshare_cgroupns)
{
int ret = unshare (CLONE_NEWCGROUP);
if (UNLIKELY (ret < 0))
Expand Down Expand Up @@ -3615,6 +3619,7 @@ libcrun_run_linux_container (libcrun_container_t *container, container_entrypoin
#if CLONE_NEWCGROUP
/* cgroup will be unshared later. Once the process is in the correct cgroup. */
init_status.all_namespaces &= ~CLONE_NEWCGROUP;
get_private_data (container)->unshare_cgroupns = init_status.namespaces_to_unshare & CLONE_NEWCGROUP;
#endif

ret = socketpair (AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sync_socket);
Expand Down