openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

AppArmor: fix task_setrlimit prototype 

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>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Jiri Slaby 2010-08-11 11:28:02 +02:00 committed by James Morris
parent da5cabf80e
commit 7cb4dc9fc9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/apparmor/lsm.c
View File

@ -607,8 +607,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
return error; return error;
} }
static int apparmor_task_setrlimit(unsigned int resource, static int apparmor_task_setrlimit(struct task_struct *task,
struct rlimit *new_rlim) unsigned int resource, struct rlimit *new_rlim)
{ {
struct aa_profile *profile = aa_current_profile(); struct aa_profile *profile = aa_current_profile();
int error = 0; int error = 0;