Commit a5b2c5b2 authored May 31, 2011 by Kees Cook Committed by James Morris Jun 01, 2011

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: Kees Cook <kees@ubuntu.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Cc: stable@kernel.org
Signed-off-by: James Morris <jmorris@namei.org>

parent e12ca23d

security/apparmor/lsm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -593,7 +593,8 @@ static int apparmor_setprocattr(struct task_struct task, char name,
		sa.aad.op = OP_SETPROCATTR;
		sa.aad.info = name;
		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);
		}
		} else if (strcmp(name, "exec") == 0) {