diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-01 16:35:37 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-01 16:35:37 +0900 |
| commit | 5c6cce92bc8aee751aafe82c5d9caf7553226a3d (patch) | |
| tree | d46ddaa86089148e39ba91ddf58430bb1d235748 | |
| parent | 603d04b2010976a52f62b7633f9999d104046900 (diff) | |
| parent | a5b2c5b2ad5853591a6cac6134cd0f599a720865 (diff) | |
| download | blackbird-op-linux-5c6cce92bc8aee751aafe82c5d9caf7553226a3d.tar.gz blackbird-op-linux-5c6cce92bc8aee751aafe82c5d9caf7553226a3d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
AppArmor: fix oops in apparmor_setprocattr
| -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 ae3a698415e6..ec1bcecf2cda 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) { |
