mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 11:22:23 +00:00
LXC: Don't mount securityfs when user namespace enabled
Right now, securityfs is disallowed to be mounted in non-initial user namespace, so we must avoid trying to mount securityfs in a container which has user namespace enabled. Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
This commit is contained in:
parent
393cf4d69b
commit
1583dfda7c
@ -750,7 +750,7 @@ err:
|
||||
}
|
||||
|
||||
|
||||
static int lxcContainerMountBasicFS(void)
|
||||
static int lxcContainerMountBasicFS(bool userns_enabled)
|
||||
{
|
||||
const struct {
|
||||
const char *src;
|
||||
@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void)
|
||||
continue;
|
||||
#endif
|
||||
|
||||
if (STREQ(mnts[i].src, "securityfs") && userns_enabled)
|
||||
continue;
|
||||
|
||||
if (virFileMakePath(mnts[i].dst) < 0) {
|
||||
virReportSystemError(errno,
|
||||
_("Failed to mkdir %s"),
|
||||
@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
|
||||
goto cleanup;
|
||||
|
||||
/* Mounts the core /proc, /sys, etc filesystems */
|
||||
if (lxcContainerMountBasicFS() < 0)
|
||||
if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0)
|
||||
goto cleanup;
|
||||
|
||||
/* Mounts /proc/meminfo etc sysinfo */
|
||||
|
Loading…
x
Reference in New Issue
Block a user