Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c6cce92 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

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
parents 603d04b2 a5b2c5b2

security/apparmor/lsm.c

+2 −1
Original line number Original line 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.op = OP_SETPROCATTR;

			sa.aad.info = name;

			sa.aad.info = name;

			sa.aad.error = -EINVAL;

			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);

					&sa, NULL);

		}

		}

	} else if (strcmp(name, "exec") == 0) {

	} else if (strcmp(name, "exec") == 0) {