Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a5b2c5b2ad5853591a6cac6134cd0f599a720865

Authored by Kees Cook
Committed by James Morris
1 parent e12ca23d41
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

security/apparmor/lsm.c
Diff comments   View file @ a5b2c5b
... ... @@ -593,7 +593,8 @@
593 593 sa.aad.op = OP_SETPROCATTR;
594 594 sa.aad.info = name;
595 595 sa.aad.error = -EINVAL;
596   - return aa_audit(AUDIT_APPARMOR_DENIED, NULL, GFP_KERNEL,
  596 + return aa_audit(AUDIT_APPARMOR_DENIED,
  597 + __aa_current_profile(), GFP_KERNEL,
597 598 &sa, NULL);
598 599 }
599 600 } else if (strcmp(name, "exec") == 0) {