aboutsummaryrefslogtreecommitdiffstats
path: root/security/apparmor/policy_ns.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2017-05-25 06:31:46 -0700
committerJohn Johansen <john.johansen@canonical.com>2017-06-08 12:51:52 -0700
commit98407f0a0d378df27bfea79301a3aba42d7cea1c (patch)
tree402c0ff7608565ce409eed578905be45c14e651f /security/apparmor/policy_ns.c
parentapparmor: rename apparmor file fns and data to indicate use (diff)
downloadlinux-dev-98407f0a0d378df27bfea79301a3aba42d7cea1c.tar.xz
linux-dev-98407f0a0d378df27bfea79301a3aba42d7cea1c.zip
apparmor: allow specifying an already created dir to create ns entries in
Signed-off-by: John Johansen <john.johansen@canonical.com> Reviewed-by: Seth Arnold <seth.arnold@canonical.com> Reviewed-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'security/apparmor/policy_ns.c')
-rw-r--r--security/apparmor/policy_ns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c
index 0a8bc4e887ef..7d7c23705be2 100644
--- a/security/apparmor/policy_ns.c
+++ b/security/apparmor/policy_ns.c
@@ -196,7 +196,7 @@ static struct aa_ns *__aa_create_ns(struct aa_ns *parent, const char *name,
if (!ns)
return NULL;
mutex_lock(&ns->lock);
- error = __aafs_ns_mkdir(ns, ns_subns_dir(parent), name);
+ error = __aafs_ns_mkdir(ns, ns_subns_dir(parent), name, dir);
if (error) {
AA_ERROR("Failed to create interface for ns %s\n",
ns->base.name);