mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 16:35:02 +01:00
dafcbfb4b6
patches 0001-0022 are backports of fixes from the 4.8 pull-request 0023-0025 are the out of tree feature patches Signed-off-by: John Johansen <john.johansen@canonical.com>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 0c67233b18406dc7a8629faf8f9452feace6fb13 Mon Sep 17 00:00:00 2001
|
|
From: John Johansen <john.johansen@canonical.com>
|
|
Date: Fri, 25 Jul 2014 04:02:08 -0700
|
|
Subject: [PATCH 06/25] apparmor: fix disconnected bind mnts reconnection
|
|
|
|
Bind mounts can fail to be properly reconnected when PATH_CONNECT is
|
|
specified. Ensure that when PATH_CONNECT is specified the path has
|
|
a root.
|
|
|
|
BugLink: http://bugs.launchpad.net/bugs/1319984
|
|
|
|
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
|
Acked-by: Seth Arnold <seth.arnold@canonical.com>
|
|
---
|
|
security/apparmor/path.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/security/apparmor/path.c b/security/apparmor/path.c
|
|
index edddc02..f261678 100644
|
|
--- a/security/apparmor/path.c
|
|
+++ b/security/apparmor/path.c
|
|
@@ -141,7 +141,10 @@ static int d_namespace_path(const struct path *path, char *buf, int buflen,
|
|
error = -EACCES;
|
|
if (*res == '/')
|
|
*name = res + 1;
|
|
- }
|
|
+ } else if (*res != '/')
|
|
+ /* CONNECT_PATH with missing root */
|
|
+ error = prepend(name, *name - buf, "/", 1);
|
|
+
|
|
}
|
|
|
|
out:
|
|
--
|
|
2.7.4
|
|
|