Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

torvalds · torvalds · commit b99ca60c83a6 · 2011-06-11T19:56:25.000-07:00
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  AppArmor: Fix sleep in invalid context from task_setrlimit
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
@@ -612,7 +612,7 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
 static int apparmor_task_setrlimit(struct task_struct *task,
 		unsigned int resource, struct rlimit *new_rlim)
 {
-	struct aa_profile *profile = aa_current_profile();
+	struct aa_profile *profile = __aa_current_profile();
 	int error = 0;
 
 	if (!unconfined(profile))

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ static int apparmor_setprocattr(struct task_struct task, char name,`
`612`	`612`	`static int apparmor_task_setrlimit(struct task_struct *task,`
`613`	`613`	`unsigned int resource, struct rlimit *new_rlim)`
`614`	`614`	`{`
`615`		`- struct aa_profile *profile = aa_current_profile();`
	`615`	`+ struct aa_profile *profile = __aa_current_profile();`
`616`	`616`	`int error = 0;`
`617`	`617`
`618`	`618`	`if (!unconfined(profile))`