Commit a5b2c5b2 authored by Kees Cook's avatar Kees Cook Committed by James Morris
Browse files

AppArmor: fix oops in apparmor_setprocattr



When invalid parameters are passed to apparmor_setprocattr a NULL deref
oops occurs when it tries to record an audit message. This is because
it is passing NULL for the profile parameter for aa_audit. But aa_audit
now requires that the profile passed is not NULL.

Fix this by passing the current profile on the task that is trying to
setprocattr.
Signed-off-by: default avatarKees Cook <kees@ubuntu.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent e12ca23d
...@@ -593,7 +593,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name, ...@@ -593,7 +593,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
sa.aad.op = OP_SETPROCATTR; sa.aad.op = OP_SETPROCATTR;
sa.aad.info = name; sa.aad.info = name;
sa.aad.error = -EINVAL; sa.aad.error = -EINVAL;
return aa_audit(AUDIT_APPARMOR_DENIED, NULL, GFP_KERNEL, return aa_audit(AUDIT_APPARMOR_DENIED,
__aa_current_profile(), GFP_KERNEL,
&sa, NULL); &sa, NULL);
} }
} else if (strcmp(name, "exec") == 0) { } else if (strcmp(name, "exec") == 0) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment