mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-10 07:10:27 +00:00
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
This commit is contained in:
commit
5c6cce92bc
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user