From 4a91324b61f97c7d0463ee3f38f67350b53b8b7b Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 3 Jan 2023 15:51:42 +0100 Subject: [PATCH] qemu_namespace: Fix detection of nested mount points When deciding whether to bind mount a path in domain's namespace, we look at the QEMU mount table (/proc/$pid/mounts) and try to match prefix of given path with one of mount points. Well, we do that in a bit clumsy way. For instance, if there's "/dev/hugepages" already mounted inside the namespace and we are deciding whether to bind mount "/dev/hugepages1G/..." we decide to skip over the path and NOT bind mount it. This is because plain STRPREFIX() is used and yes, the former is prefix of the latter. What we need to check also is whether the next character after the prefix is slash. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_namespace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index fb79460109..fc348c043e 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -1264,9 +1264,11 @@ qemuNamespacePrepareOneItem(qemuNamespaceMknodData *data, bool found = false; for (n = devMountsPath; n && *n; n++) { + const char *p; + if (STREQ(*n, "/dev")) continue; - if (STRPREFIX(item.file, *n)) { + if ((p = STRSKIP(item.file, *n)) && *p == '/') { found = true; break; }