diff options
author | John Johansen | 2017-01-16 09:42:47 +0100 |
---|---|---|
committer | John Johansen | 2017-01-16 10:18:37 +0100 |
commit | b79473f2de3eb3320e2a145da8a2ea03c7331784 (patch) | |
tree | e02004ebe5b7e02d900c603d988126fb0ece719a /security/apparmor/apparmorfs.c | |
parent | apparmor: track ns level so it can be used to help in view checks (diff) | |
download | kernel-qcow2-linux-b79473f2de3eb3320e2a145da8a2ea03c7331784.tar.gz kernel-qcow2-linux-b79473f2de3eb3320e2a145da8a2ea03c7331784.tar.xz kernel-qcow2-linux-b79473f2de3eb3320e2a145da8a2ea03c7331784.zip |
apparmor: Make aa_remove_profile() callable from a different view
This is prep work for fs operations being able to remove namespaces.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/apparmorfs.c')
-rw-r--r-- | security/apparmor/apparmorfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 2501a65fe7d3..14b96a44a3f5 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -180,7 +180,8 @@ static ssize_t profile_remove(struct file *f, const char __user *buf, error = PTR_ERR(data); if (!IS_ERR(data)) { data[size] = 0; - error = aa_remove_profiles(data, size); + error = aa_remove_profiles(__aa_current_profile()->ns, data, + size); kvfree(data); } |