mirror/feed_opensource
1
0
Fork 0
mirror of https://gitlab.com/prpl-foundation/prplos/feeds/feed_opensource.git synced 2026-01-06 17:43:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev_ppw252' into 'mainline-23.05'

Browse Source 
lxc: show network config of unprivileged containers (PPW-285)

See merge request prpl-foundation/prplos/feeds/feed_opensource!6
This commit is contained in:
Matthias Franck
2024-12-19 15:45:56 +00:00
parent 2f96a3a4f7 da12209be6
commit cfbbc414e5
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/utils/lxc/patches/045-enter-net-namespace-before-user-namespace.patch Normal file
View File

@@ -0,0 +1,21 @@
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 5b4610333..748f663b8 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2251,12 +2251,15 @@ static inline bool enter_net_ns(struct lxc_container *c)
if (pid < 0)
return false;
+ if(!switch_to_ns(pid, "net"))
+ return false;
+
if ((geteuid() != 0 || (c->lxc_conf && !list_empty(&c->lxc_conf->id_map))) &&
(access("/proc/self/ns/user", F_OK) == 0))
if (!switch_to_ns(pid, "user"))
return false;
- return switch_to_ns(pid, "net");
+ return true;
}
/* Used by qsort and bsearch functions for comparing names. */