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@xxxxxxxxxxxxxx> --- 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>