| commit | 7cb4dc9fc95f89587f57f287b47e091d7806255e | |
| author | Jiri Slaby <jslaby@suse.cz> | |
| Wed, 11 Aug 2010 09:28:02 +0000 (11 11:28 +0200) | ||
| committer | James Morris <jmorris@namei.org> | |
| Mon, 16 Aug 2010 22:06:09 +0000 (17 08:06 +1000) | ||
| tree | 41f68ee728c0ab1b894e425933a166e990e1eb41 | treesnapshot (tar.gz zip) |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 | commitdiff |
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>
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>
| security/apparmor/lsm.c | diffblobblamehistory |