Commit 7cb4dc9f authored Aug 11, 2010 by Jiri Slaby Committed by James Morris Aug 17, 2010

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>

parent da5cabf8

security/apparmor/lsm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message