diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-11 22:56:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-11 22:56:25 -0400 |
| commit | b99ca60c83a631adaba9c2fff8f2dd14d3517a61 (patch) | |
| tree | f4226d85217786aceb727aa53040cefc4ab2ea75 | |
| parent | 56a210526adb2854d5b7c398a40260720390ee05 (diff) | |
| parent | 1780f2d3839a0d3eb85ee014a708f9e2c8f8ba0e (diff) | |
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, | |||
| 612 | static int apparmor_task_setrlimit(struct task_struct *task, | 612 | static int apparmor_task_setrlimit(struct task_struct *task, |
| 613 | unsigned int resource, struct rlimit *new_rlim) | 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 | int error = 0; | 616 | int error = 0; |
| 617 | 617 | ||
| 618 | if (!unconfined(profile)) | 618 | if (!unconfined(profile)) |