Messages in this thread Patch in this message | | | From | Jiri Slaby <> | Subject | [PATCH 1/1] AppArmor: fix task_setrlimit prototype | Date | Wed, 11 Aug 2010 11:28:02 +0200 |
| |
After rlimits tree was merged we get the following errors: security/apparmor/lsm.c:663:2: warning: initialization from incompatible pointer type
It is because AppArmor was merged in the meantime, but uses the old prototype. So fix it by adding struct task_struct as a first parameter of apparmor_task_setrlimit.
NOTE that this is ONLY a compilation warning fix (and crashes caused by that). It needs proper handling in AppArmor depending on who is the 'task'.
Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: John Johansen <john.johansen@canonical.com> Cc: James Morris <jmorris@namei.org> --- 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 8db33a8..06f4d02 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, return error; } -static int apparmor_task_setrlimit(unsigned int resource, - struct rlimit *new_rlim) +static int apparmor_task_setrlimit(struct task_struct *task, + unsigned int resource, struct rlimit *new_rlim) { struct aa_profile *profile = aa_current_profile(); int error = 0; -- 1.7.2.1
| |