From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 28 Jul 2018 15:42:41 +0000 (+0900)
Subject: core/namespace: drop mount points outside of root even if RootDirectory= is not set
X-Git-Tag: v240~854^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839f18775317bb2e9f8f46588d6f79ca09547e8a;p=thirdparty%2Fsystemd.git

core/namespace: drop mount points outside of root even if RootDirectory= is not set
---

diff --git a/src/core/namespace.c b/src/core/namespace.c
index c1ee84779a8..201192a5a55 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1276,7 +1276,7 @@ int setup_namespace(
                 if (r < 0)
                         goto finish;
 
-                normalize_mounts(root_directory, mounts, &n_mounts);
+                normalize_mounts(root, mounts, &n_mounts);
         }
 
         if (unshare(CLONE_NEWNS) < 0) {
@@ -1375,7 +1375,7 @@ int setup_namespace(
                         if (!again)
                                 break;
 
-                        normalize_mounts(root_directory, mounts, &n_mounts);
+                        normalize_mounts(root, mounts, &n_mounts);
                 }
 
                 /* Create a blacklist we can pass to bind_mount_recursive() */