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 sleep in invalid context from task_setrlimit
This commit is contained in:
commit
b99ca60c83
|
@ -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))
|
||||
|
|
Loading…
Reference in a new issue