Home » Mailing list archives » linux-kernel » 2010 » June » 17

[PATCH 6/9] oom: unify CAP_SYS_RAWIO check into other superuser check

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: KOSAKI Motohiro
Subject: [PATCH 6/9] oom: unify CAP_SYS_RAWIO check into other superuser check
Date: Wednesday, June 16, 2010 - 6:51 pm

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 <kosaki.motohiro@jp.fujitsu.com>
---
 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 b27db90..7f91151 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -199,19 +199,14 @@ 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.
+	 * 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



--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/9] oom: don't try to kill oom_unkillable child, KOSAKI Motohiro, (Wed Jun 16, 6:45 pm)
[PATCH 2/9] oom: oom_kill_process() doesn't select kthread ..., KOSAKI Motohiro, (Wed Jun 16, 6:51 pm)
[PATCH 3/9] oom: make oom_unkillable_task() helper function, KOSAKI Motohiro, (Wed Jun 16, 6:51 pm)
[PATCH 4/9] oom: oom_kill_process() need to check p is unk ..., KOSAKI Motohiro, (Wed Jun 16, 6:51 pm)
[PATCH 5/9] oom: cleanup has_intersects_mems_allowed(), KOSAKI Motohiro, (Wed Jun 16, 6:51 pm)
[PATCH 6/9] oom: unify CAP_SYS_RAWIO check into other supe ..., KOSAKI Motohiro, (Wed Jun 16, 6:51 pm)
[PATCH 8/9] oom: give the dying task a higher priority, KOSAKI Motohiro, (Wed Jun 16, 6:51 pm)
[PATCH 9/9] oom: multi threaded process coredump don't mak ..., KOSAKI Motohiro, (Wed Jun 16, 6:51 pm)
[PATCH 7/9] oom: remove child-&gt;mm check from oom_kill_proc ..., KOSAKI Motohiro, (Wed Jun 16, 6:51 pm)
Re: [PATCH 6/9] oom: unify CAP_SYS_RAWIO check into other ..., David Rientjes, (Wed Jun 16, 9:18 pm)
Re: [PATCH 4/9] oom: oom_kill_process() need to check p is ..., David Rientjes, (Wed Jun 16, 9:19 pm)
Re: [PATCH 5/9] oom: cleanup has_intersects_mems_allowed(), David Rientjes, (Wed Jun 16, 9:20 pm)
Re: [PATCH 4/9] oom: oom_kill_process() need to check p is ..., KOSAKI Motohiro, (Mon Jun 21, 4:45 am)
Re: [PATCH 5/9] oom: cleanup has_intersects_mems_allowed(), KOSAKI Motohiro, (Mon Jun 21, 4:45 am)
Re: [PATCH 6/9] oom: unify CAP_SYS_RAWIO check into other ..., KOSAKI Motohiro, (Mon Jun 21, 4:46 am)
Re: [PATCH 4/9] oom: oom_kill_process() need to check p is ..., Minchan Kim, (Mon Jun 21, 7:00 am)
Re: [PATCH 4/9] oom: oom_kill_process() need to check p is ..., David Rientjes, (Mon Jun 21, 1:04 pm)
Re: [PATCH 5/9] oom: cleanup has_intersects_mems_allowed(), David Rientjes, (Mon Jun 21, 1:09 pm)
Re: [PATCH 2/9] oom: oom_kill_process() doesn't select kth ..., David Rientjes, (Mon Jun 21, 1:14 pm)
Re: [PATCH 3/9] oom: make oom_unkillable_task() helper fun ..., David Rientjes, (Mon Jun 21, 1:15 pm)
Re: [PATCH 4/9] oom: oom_kill_process() need to check p is ..., KOSAKI Motohiro, (Wed Jun 30, 2:26 am)
Re: [PATCH 5/9] oom: cleanup has_intersects_mems_allowed(), KOSAKI Motohiro, (Wed Jun 30, 2:26 am)
Re: [PATCH 2/9] oom: oom_kill_process() doesn't select kth ..., KOSAKI Motohiro, (Wed Jun 30, 2:26 am)
Re: [PATCH 3/9] oom: make oom_unkillable_task() helper fun ..., KOSAKI Motohiro, (Wed Jun 30, 2:26 am)