diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 21:37:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 21:37:03 -0400 |
| commit | 3b89f56783a4ef796190ef1192c25e72e0b986b6 (patch) | |
| tree | 9d34f03092a38fd79f14003c88489323f32d9334 /security | |
| parent | 392abeea52db4dc870c0ea41912df8ca60b27d44 (diff) | |
| parent | 7cb4dc9fc95f89587f57f287b47e091d7806255e (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 task_setrlimit prototype
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/lsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index d5666d3cc21b..f73e2c204218 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c | |||
| @@ -607,8 +607,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name, | |||
| 607 | return error; | 607 | return error; |
| 608 | } | 608 | } |
| 609 | 609 | ||
| 610 | static int apparmor_task_setrlimit(unsigned int resource, | 610 | static int apparmor_task_setrlimit(struct task_struct *task, |
| 611 | struct rlimit *new_rlim) | 611 | unsigned int resource, struct rlimit *new_rlim) |
| 612 | { | 612 | { |
| 613 | struct aa_profile *profile = aa_current_profile(); | 613 | struct aa_profile *profile = aa_current_profile(); |
| 614 | int error = 0; | 614 | int error = 0; |