Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758821Ab0FPLer (ORCPT ); Wed, 16 Jun 2010 07:34:47 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:46902 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757905Ab0FPLeq (ORCPT ); Wed, 16 Jun 2010 07:34:46 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: LKML , linux-mm , Andrew Morton , David Rientjes , KAMEZAWA Hiroyuki Subject: [PATCH 7/9] oom: unify CAP_SYS_RAWIO check into other superuser check Cc: kosaki.motohiro@jp.fujitsu.com In-Reply-To: <20100616201948.72D7.A69D9226@jp.fujitsu.com> References: <20100616201948.72D7.A69D9226@jp.fujitsu.com> Message-Id: <20100616203404.72E9.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.50.07 [ja] Date: Wed, 16 Jun 2010 20:34:43 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1747 Lines: 52 Now, CAP_SYS_RAWIO check is very strange. if the user have both CAP_SYS_ADMIN and CAP_SYS_RAWIO, points will makes 1/16. Superuser's 1/4 bonus worthness is quite a bit dubious, but considerable. However 1/16 is obviously insane. Signed-off-by: KOSAKI Motohiro --- mm/oom_kill.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index e4b1146..4236d39 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -198,19 +198,14 @@ unsigned long oom_badness(struct task_struct *p, unsigned long uptime) /* * Superuser processes are usually more important, so we make it - * less likely that we kill those. + * less likely that we kill those. And we don't want to kill a + * process with direct hardware access. Not only could that mess + * up the hardware, but usually users tend to only have this + * flag set on applications they think of as important. */ if (has_capability_noaudit(p, CAP_SYS_ADMIN) || - has_capability_noaudit(p, CAP_SYS_RESOURCE)) - points /= 4; - - /* - * We don't want to kill a process with direct hardware access. - * Not only could that mess up the hardware, but usually users - * tend to only have this flag set on applications they think - * of as important. - */ - if (has_capability_noaudit(p, CAP_SYS_RAWIO)) + has_capability_noaudit(p, CAP_SYS_RESOURCE) || + has_capability_noaudit(p, CAP_SYS_RAWIO)) points /= 4; /* -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/