summaryrefslogtreecommitdiff
path: root/security/apparmor/apparmorfs.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2017-01-16 00:42:57 -0800
committerJohn Johansen <john.johansen@canonical.com>2017-01-16 01:18:43 -0800
commit12dd7171d645a6658326ba234e6d4fc57a73bf98 (patch)
treecdbeda2b6296f87a9f7480271371758d0035791b /security/apparmor/apparmorfs.c
parent04dc715e24d0820bf8740e1a1135ed61fe162bc8 (diff)
apparmor: pass the subject profile into profile replace/remove
This is just setup for new ns specific .load, .replace, .remove interface files. Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/apparmorfs.c')
-rw-r--r--security/apparmor/apparmorfs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 2e6790cf54da..d654aacd7db4 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -133,7 +133,7 @@ static ssize_t policy_update(int binop, const char __user *buf, size_t size,
data = aa_simple_write_to_buffer(op, buf, size, size, pos);
error = PTR_ERR(data);
if (!IS_ERR(data)) {
- error = aa_replace_profiles(profile->ns, binop, data);
+ error = aa_replace_profiles(profile->ns, profile, binop, data);
aa_put_loaddata(data);
}
@@ -192,7 +192,8 @@ static ssize_t profile_remove(struct file *f, const char __user *buf,
error = PTR_ERR(data);
if (!IS_ERR(data)) {
data->data[size] = 0;
- error = aa_remove_profiles(profile->ns, data->data, size);
+ error = aa_remove_profiles(profile->ns, profile, data->data,
+ size);
aa_put_loaddata(data);
}
out: