10:40 a.m.
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Update of
https://www.redhat.com/archives/libvir-list/2013-October/msg00270.html
Previously I just re-sent the one patch needing changes. This time I
am reposting the whole series after rebasing.
Daniel P. Berrange (6):
Add virFileIsMountPoint function
Remove unused 'opts' field from LXC basic mounts struct
Remove pointless 'srcpath' variable in lxcContainerMountBasicFS
Remove duplicate entries in lxcBasicMounts array
Add flag to lxcBasicMounts to control use in user namespaces
Skip any files which are not mounted on the host
src/libvirt_private.syms | 1 +
src/lxc/lxc_container.c | 86 +++++++++++++++++++++++++++++-------------------
src/util/virfile.c | 50 ++++++++++++++++++++++++++++
src/util/virfile.h | 2 ++
4 files changed, 105 insertions(+), 34 deletions(-)
--
1.8.3.1
10:40 a.m.
New subject: [libvirt] [PATCH v2 REPOST 1/6] Add virFileIsMountPoint function
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Add a function for efficiently checking if a path is a filesystem
mount point.
NB will not work for bind mounts, only true filesystem mounts.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/libvirt_private.syms | 1 +
src/util/virfile.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
src/util/virfile.h | 2 ++
3 files changed, 53 insertions(+)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f1f817c..ea68490 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1188,6 +1188,7 @@ virFileIsAbsPath;
virFileIsDir;
virFileIsExecutable;
virFileIsLink;
+virFileIsMountPoint;
virFileLinkPointsTo;
virFileLock;
virFileLoopDeviceAssociate;
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 3a9980c..9fde99c 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1518,6 +1518,56 @@ virFileIsExecutable(const char *file)
return false;
}
+
+/*
+ * Check that a file refers to a mount point. Trick is that for
+ * a mount point, the st_dev field will differ from the parent
+ * directory.
+ *
+ * Note that this will not detect bind mounts of dirs/files,
+ * only true filesystem mounts.
+ */
+int virFileIsMountPoint(const char *file)
+{
+ char *parent = NULL;
+ int ret = -1;
+ struct stat sb1, sb2;
+
+ if (!(parent = mdir_name(file))) {
+ virReportOOMError();
+ goto cleanup;
+ }
+
+ VIR_DEBUG("Comparing '%s' to '%s'", file, parent);
+
+ if (stat(file, &sb1) < 0) {
+ if (errno == ENOENT)
+ ret = 0;
+ else
+ virReportSystemError(errno,
+ _("Cannot stat '%s'"),
+ file);
+ goto cleanup;
+ }
+
+ if (stat(parent, &sb2) < 0) {
+ virReportSystemError(errno,
+ _("Cannot stat '%s'"),
+ parent);
+ goto cleanup;
+ }
+
+ if (!S_ISDIR(sb1.st_mode))
+ return false;
+
+ ret = sb1.st_dev != sb2.st_dev;
+ VIR_DEBUG("Is mount %d", ret);
+
+ cleanup:
+ VIR_FREE(parent);
+ return ret;
+}
+
#ifndef WIN32
/* Check that a file is accessible under certain
* user & gid.
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 72d35ce..ff84719 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -156,6 +156,8 @@ bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1);
bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1);
bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1);
+int virFileIsMountPoint(const char *file) ATTRIBUTE_NONNULL(1);
+
char *virFileSanitizePath(const char *path);
enum {
--
1.8.3.1
4:11 a.m.
New subject: [libvirt] [PATCH v2 REPOST 1/6] Add virFileIsMountPoint function
On 10/28/2013 11:40 PM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Add a function for efficiently checking if a path is a filesystem
mount point.
NB will not work for bind mounts, only true filesystem mounts.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/libvirt_private.syms | 1 +
src/util/virfile.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
src/util/virfile.h | 2 ++
3 files changed, 53 insertions(+)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f1f817c..ea68490 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1188,6 +1188,7 @@ virFileIsAbsPath;
virFileIsDir;
virFileIsExecutable;
virFileIsLink;
+virFileIsMountPoint;
virFileLinkPointsTo;
virFileLock;
virFileLoopDeviceAssociate;
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 3a9980c..9fde99c 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1518,6 +1518,56 @@ virFileIsExecutable(const char *file)
return false;
}
+
+/*
+ * Check that a file refers to a mount point. Trick is that for
+ * a mount point, the st_dev field will differ from the parent
+ * directory.
+ *
+ * Note that this will not detect bind mounts of dirs/files,
+ * only true filesystem mounts.
+ */
+int virFileIsMountPoint(const char *file)
+{
+ char *parent = NULL;
+ int ret = -1;
+ struct stat sb1, sb2;
+
+ if (!(parent = mdir_name(file))) {
+ virReportOOMError();
+ goto cleanup;
+ }
+
+ VIR_DEBUG("Comparing '%s' to '%s'", file, parent);
+
+ if (stat(file, &sb1) < 0) {
+ if (errno == ENOENT)
+ ret = 0;
+ else
+ virReportSystemError(errno,
+ _("Cannot stat '%s'"),
+ file);
+ goto cleanup;
+ }
+
+ if (stat(parent, &sb2) < 0) {
+ virReportSystemError(errno,
+ _("Cannot stat '%s'"),
+ parent);
+ goto cleanup;
+ }
+
+ if (!S_ISDIR(sb1.st_mode))
VIR_FREE(parent)
Acked-by: Gao feng <gaofeng(a)cn.fujitsu.com>
+ return false;
+
+ ret = sb1.st_dev != sb2.st_dev;
+ VIR_DEBUG("Is mount %d", ret);
+
+ cleanup:
+ VIR_FREE(parent);
+ return ret;
+}
+
#ifndef WIN32
/* Check that a file is accessible under certain
* user & gid.
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 72d35ce..ff84719 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -156,6 +156,8 @@ bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1);
bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1);
bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1);
+int virFileIsMountPoint(const char *file) ATTRIBUTE_NONNULL(1);
+
char *virFileSanitizePath(const char *path);
enum {
10:40 a.m.
New subject: [libvirt] [PATCH v2 REPOST 2/6] Remove unused 'opts' field from LXC basic mounts struct
From: "Daniel P. Berrange" <berrange(a)redhat.com>
The virLXCBasicMountInfo struct contains a 'char *opts'
field passed onto the mount() syscall. Every entry in the
list sets this to NULL though, so it can be removed to
simplify life.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/lxc/lxc_container.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 1ec59d5..276c2f6 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -754,7 +754,6 @@ typedef struct {
const char *src;
const char *dst;
const char *type;
- const char *opts;
int mflags;
} virLXCBasicMountInfo;
@@ -765,16 +764,16 @@ static const virLXCBasicMountInfo lxcBasicMounts[] = {
* mount point in the main OS becomes readonly too which is not what
* we want. Hence some things have two entries here.
*/
- { "proc", "/proc", "proc", NULL,
MS_NOSUID|MS_NOEXEC|MS_NODEV },
- { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND },
- { "/proc/sys", "/proc/sys", NULL, NULL,
MS_BIND|MS_REMOUNT|MS_RDONLY },
- { "sysfs", "/sys", "sysfs", NULL,
MS_NOSUID|MS_NOEXEC|MS_NODEV },
- { "sysfs", "/sys", "sysfs", NULL,
MS_BIND|MS_REMOUNT|MS_RDONLY },
- { "securityfs", "/sys/kernel/security", "securityfs",
NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
- { "securityfs", "/sys/kernel/security", "securityfs",
NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
+ { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV
},
+ { "/proc/sys", "/proc/sys", NULL, MS_BIND },
+ { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY
},
+ { "sysfs", "/sys", "sysfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV },
+ { "sysfs", "/sys", "sysfs",
MS_BIND|MS_REMOUNT|MS_RDONLY },
+ { "securityfs", "/sys/kernel/security", "securityfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV },
+ { "securityfs", "/sys/kernel/security", "securityfs",
MS_BIND|MS_REMOUNT|MS_RDONLY },
#if WITH_SELINUX
- { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", NULL,
MS_NOSUID|MS_NOEXEC|MS_NODEV },
- { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
+ { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV
},
+ { SELINUX_MOUNT, SELINUX_MOUNT, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
#endif
};
@@ -884,13 +883,13 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
goto cleanup;
}
- VIR_DEBUG("Mount %s on %s type=%s flags=%x, opts=%s",
- srcpath, mnt->dst, mnt->type, mnt->mflags, mnt->opts);
- if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, mnt->opts) <
0) {
+ VIR_DEBUG("Mount %s on %s type=%s flags=%x",
+ srcpath, mnt->dst, mnt->type, mnt->mflags);
+ if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
virReportSystemError(errno,
- _("Failed to mount %s on %s type %s flags=%x
opts=%s"),
+ _("Failed to mount %s on %s type %s
flags=%x"),
srcpath, mnt->dst, NULLSTR(mnt->type),
- mnt->mflags, NULLSTR(mnt->opts));
+ mnt->mflags);
goto cleanup;
}
}
--
1.8.3.1
10:40 a.m.
New subject: [libvirt] [PATCH v2 REPOST 3/6] Remove pointless 'srcpath' variable in lxcContainerMountBasicFS
From: "Daniel P. Berrange" <berrange(a)redhat.com>
The 'srcpath' variable is initialized from 'mnt->src' and never
changed thereafter. Some places continue to use 'mnt->src' and
others use 'srcpath'. Remove the pointless 'srcpath' variable
and use 'mnt->src' everywhere.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/lxc/lxc_container.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 276c2f6..7cf24b3 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -855,16 +855,13 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) {
virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i];
- const char *srcpath = NULL;
VIR_DEBUG("Processing %s -> %s",
mnt->src, mnt->dst);
- srcpath = mnt->src;
-
/* Skip if mount doesn't exist in source */
- if ((srcpath[0] == '/') &&
- (access(srcpath, R_OK) < 0))
+ if ((mnt->src[0] == '/') &&
+ (access(mnt->src, R_OK) < 0))
continue;
#if WITH_SELINUX
@@ -884,11 +881,11 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
}
VIR_DEBUG("Mount %s on %s type=%s flags=%x",
- srcpath, mnt->dst, mnt->type, mnt->mflags);
- if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
+ mnt->src, mnt->dst, mnt->type, mnt->mflags);
+ if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags, NULL) < 0)
{
virReportSystemError(errno,
_("Failed to mount %s on %s type %s
flags=%x"),
- srcpath, mnt->dst, NULLSTR(mnt->type),
+ mnt->src, mnt->dst, NULLSTR(mnt->type),
mnt->mflags);
goto cleanup;
}
--
1.8.3.1
10:40 a.m.
New subject: [libvirt] [PATCH v2 REPOST 4/6] Remove duplicate entries in lxcBasicMounts array
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Currently the lxcBasicMounts array has separate entries for
most mounts, to reflect that we must do a separate mount
operation to make mounts read-only. Remove the duplicate
entries and instead set the MS_RDONLY flag against the main
entry. Then change lxcContainerMountBasicFS to look for the
MS_RDONLY flag, mask it out & do a separate bind mount.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/lxc/lxc_container.c | 44 +++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 7cf24b3..46a6246 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -758,22 +758,12 @@ typedef struct {
} virLXCBasicMountInfo;
static const virLXCBasicMountInfo lxcBasicMounts[] = {
- /* When we want to make a bind mount readonly, for unknown reasons,
- * it is currently necessary to bind it once, and then remount the
- * bind with the readonly flag. If this is not done, then the original
- * mount point in the main OS becomes readonly too which is not what
- * we want. Hence some things have two entries here.
- */
{ "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV
},
- { "/proc/sys", "/proc/sys", NULL, MS_BIND },
- { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY
},
- { "sysfs", "/sys", "sysfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV },
- { "sysfs", "/sys", "sysfs",
MS_BIND|MS_REMOUNT|MS_RDONLY },
- { "securityfs", "/sys/kernel/security", "securityfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV },
- { "securityfs", "/sys/kernel/security", "securityfs",
MS_BIND|MS_REMOUNT|MS_RDONLY },
+ { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY },
+ { "sysfs", "/sys", "sysfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
+ { "securityfs", "/sys/kernel/security", "securityfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
#if WITH_SELINUX
- { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV
},
- { SELINUX_MOUNT, SELINUX_MOUNT, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
+ { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
#endif
};
@@ -854,6 +844,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
VIR_DEBUG("Mounting basic filesystems");
for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) {
+ bool bindOverReadonly;
virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i];
VIR_DEBUG("Processing %s -> %s",
@@ -880,13 +871,32 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
goto cleanup;
}
+ /*
+ * We can't immediately set the MS_RDONLY flag when mounting filesystems
+ * because (in at least some kernel versions) this will propagate back
+ * to the original mount in the host OS, turning it readonly too. Thus
+ * we mount the filesystem in read-write mode initially, and then do a
+ * separate read-only bind mount on top of that.
+ */
+ bindOverReadonly = !!(mnt->mflags & MS_RDONLY);
+
VIR_DEBUG("Mount %s on %s type=%s flags=%x",
- mnt->src, mnt->dst, mnt->type, mnt->mflags);
- if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags, NULL) < 0)
{
+ mnt->src, mnt->dst, mnt->type, mnt->mflags &
~MS_RDONLY);
+ if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags &
~MS_RDONLY, NULL) < 0) {
virReportSystemError(errno,
_("Failed to mount %s on %s type %s
flags=%x"),
mnt->src, mnt->dst, NULLSTR(mnt->type),
- mnt->mflags);
+ mnt->mflags & ~MS_RDONLY);
+ goto cleanup;
+ }
+
+ if (bindOverReadonly &&
+ mount(mnt->src, mnt->dst, NULL,
+ MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) {
+ virReportSystemError(errno,
+ _("Failed to re-mount %s on %s flags=%x"),
+ mnt->src, mnt->dst,
+ MS_BIND|MS_REMOUNT|MS_RDONLY);
goto cleanup;
}
}
--
1.8.3.1
10:40 a.m.
New subject: [libvirt] [PATCH v2 REPOST 5/6] Add flag to lxcBasicMounts to control use in user namespaces
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Some mounts must be skipped if running inside a user namespace,
since the kernel forbids their use. Instead of strcmp'ing the
filesystem type in the body of the loop, set an explicit flag
in the lxcBasicMounts table.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/lxc/lxc_container.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 46a6246..992930d 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -755,15 +755,16 @@ typedef struct {
const char *dst;
const char *type;
int mflags;
+ bool skipUserNS;
} virLXCBasicMountInfo;
static const virLXCBasicMountInfo lxcBasicMounts[] = {
- { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV
},
- { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY },
- { "sysfs", "/sys", "sysfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
- { "securityfs", "/sys/kernel/security", "securityfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
+ { "proc", "/proc", "proc",
MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
+ { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false },
+ { "sysfs", "/sys", "sysfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false },
+ { "securityfs", "/sys/kernel/security", "securityfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
#if WITH_SELINUX
- { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
+ { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
#endif
};
@@ -857,12 +858,14 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
#if WITH_SELINUX
if (STREQ(mnt->src, SELINUX_MOUNT) &&
- (!is_selinux_enabled() || userns_enabled))
+ !is_selinux_enabled())
continue;
#endif
- if (STREQ(mnt->src, "securityfs") && userns_enabled)
+ if (mnt->skipUserNS && userns_enabled) {
+ VIR_DEBUG("Skipping due to user ns enablement");
continue;
+ }
if (virFileMakePath(mnt->dst) < 0) {
virReportSystemError(errno,
--
1.8.3.1
10:40 a.m.
New subject: [libvirt] [PATCH v2 REPOST 6/6] Skip any files which are not mounted on the host
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Currently the LXC container tries to skip selinux/securityfs
mounts if the directory does not exist in the filesystem,
or if SELinux is disabled.
The former check is flawed because the /sys/fs/selinux
or /sys/kernel/securityfs directories may exist in sysfs
even if the mount type is disabled. Instead of just doing
an access() check, use an virFileIsMounted() to see if
the FS is actually present in the host OS. This also
avoids the need to check is_selinux_enabled().
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/lxc/lxc_container.c | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 992930d..9e5a735 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -756,15 +756,16 @@ typedef struct {
const char *type;
int mflags;
bool skipUserNS;
+ bool skipUnmounted;
} virLXCBasicMountInfo;
static const virLXCBasicMountInfo lxcBasicMounts[] = {
- { "proc", "/proc", "proc",
MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
- { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false },
- { "sysfs", "/sys", "sysfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false },
- { "securityfs", "/sys/kernel/security", "securityfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
+ { "proc", "/proc", "proc",
MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false },
+ { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false, false
},
+ { "sysfs", "/sys", "sysfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false },
+ { "securityfs", "/sys/kernel/security", "securityfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true },
#if WITH_SELINUX
- { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
+ { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true },
#endif
};
@@ -851,16 +852,24 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
VIR_DEBUG("Processing %s -> %s",
mnt->src, mnt->dst);
- /* Skip if mount doesn't exist in source */
- if ((mnt->src[0] == '/') &&
- (access(mnt->src, R_OK) < 0))
- continue;
+ if (mnt->skipUnmounted) {
+ char *hostdir;
+ int ret;
-#if WITH_SELINUX
- if (STREQ(mnt->src, SELINUX_MOUNT) &&
- !is_selinux_enabled())
- continue;
-#endif
+ if (virAsprintf(&hostdir, "/.oldroot%s", mnt->dst) < 0)
+ goto cleanup;
+
+ ret = virFileIsMountPoint(hostdir);
+ VIR_FREE(hostdir);
+ if (ret < 0)
+ goto cleanup;
+
+ if (ret == 0) {
+ VIR_DEBUG("Skipping '%s' which isn't mounted in
host",
+ mnt->dst);
+ continue;
+ }
+ }
if (mnt->skipUserNS && userns_enabled) {
VIR_DEBUG("Skipping due to user ns enablement");
--
1.8.3.1
4:29 a.m.
On 10/28/2013 11:40 PM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Update of
https://www.redhat.com/archives/libvir-list/2013-October/msg00270.html
Previously I just re-sent the one patch needing changes. This time I
am reposting the whole series after rebasing.
Daniel P. Berrange (6):
Add virFileIsMountPoint function
Remove unused 'opts' field from LXC basic mounts struct
Remove pointless 'srcpath' variable in lxcContainerMountBasicFS
Remove duplicate entries in lxcBasicMounts array
Add flag to lxcBasicMounts to control use in user namespaces
Skip any files which are not mounted on the host
Ack this serial .
Thanks!
src/libvirt_private.syms | 1 +
src/lxc/lxc_container.c | 86 +++++++++++++++++++++++++++++-------------------
src/util/virfile.c | 50 ++++++++++++++++++++++++++++
src/util/virfile.h | 2 ++
4 files changed, 105 insertions(+), 34 deletions(-)
4076
days inactive
4077
days old
8 comments
2 participants
participants (2)
-
Daniel P. Berrange -
Gao feng