diff options
| author | Kees Cook <kees.cook@canonical.com> | 2011-05-31 11:31:41 -0700 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-01 13:07:03 +1000 |
| commit | a5b2c5b2ad5853591a6cac6134cd0f599a720865 (patch) | |
| tree | e49bdfe8a1bdcc1a15219d1d940a1776bb79446a /security/apparmor | |
| parent | e12ca23d41bd157354a5d1aadff30211a410c53a (diff) | |
| download | linux-3.10-a5b2c5b2ad5853591a6cac6134cd0f599a720865.tar.gz linux-3.10-a5b2c5b2ad5853591a6cac6134cd0f599a720865.tar.bz2 linux-3.10-a5b2c5b2ad5853591a6cac6134cd0f599a720865.zip | |
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>
Diffstat (limited to 'security/apparmor')
| -rw-r--r-- | security/apparmor/lsm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index ae3a698415e..ec1bcecf2cd 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -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) { |