From: Eric Paris Date: Tue, 11 Nov 2008 11:02:54 +0000 (+1100) Subject: The oomkiller calculations make decisions based on capabilities. Since X-Git-Tag: v2.6.29-rc1~588^2^2~94 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a2f2945a99057c7d44043465906c6bb63c3368a0;p=linux-2.6-omap-h63xx.git The oomkiller calculations make decisions based on capabilities. Since these are not security decisions and LSMs should not record if they fall the request they should use the new has_capability_noaudit() interface so the denials will not be recorded. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris --- diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 64e5b4bcd96..34a458aa799 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -129,8 +129,8 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) * Superuser processes are usually more important, so we make it * less likely that we kill those. */ - if (has_capability(p, CAP_SYS_ADMIN) || - has_capability(p, CAP_SYS_RESOURCE)) + if (has_capability_noaudit(p, CAP_SYS_ADMIN) || + has_capability_noaudit(p, CAP_SYS_RESOURCE)) points /= 4; /* @@ -139,7 +139,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) * tend to only have this flag set on applications they think * of as important. */ - if (has_capability(p, CAP_SYS_RAWIO)) + if (has_capability_noaudit(p, CAP_SYS_RAWIO)) points /= 4; /*