diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 04:56:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 04:56:25 +0200 |
| commit | b99ca60c83a631adaba9c2fff8f2dd14d3517a61 (patch) | |
| tree | f4226d85217786aceb727aa53040cefc4ab2ea75 | |
| parent | linux/seqlock.h should #include asm/processor.h for cpu_relax() (diff) | |
| parent | AppArmor: Fix sleep in invalid context from task_setrlimit (diff) | |
| download | linux-b99ca60c83a631adaba9c2fff8f2dd14d3517a61.tar.xz linux-b99ca60c83a631adaba9c2fff8f2dd14d3517a61.zip | |
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
| -rw-r--r-- | security/apparmor/lsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index ec1bcecf2cda..3d2fd141dff7 100644 --- 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)) |