Commit b99ca60c83a631adaba9c2fff8f2dd14d3517a61
Exists in
master
and in
4 other branches
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri…
…s/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
Showing 1 changed file Side-by-side Diff
security/apparmor/lsm.c
| ... | ... | @@ -612,7 +612,7 @@ |
| 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)) |