Subject: [folded-merged] mm-oom-prefer-thread-group-leaders-for-display-purposes-fix.patch removed from -mm tree
To: rientjes@xxxxxxxxxx,gthelen@xxxxxxxxxx,hannes@xxxxxxxxxxx,kamezawa.hiroyu@xxxxxxxxxxxxxx,mhocko@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 23 Jan 2014 15:20:52 -0800
The patch titled
Subject: mm, oom: prefer thread group leaders for display purposes fix
has been removed from the -mm tree. Its filename was
mm-oom-prefer-thread-group-leaders-for-display-purposes-fix.patch
This patch was dropped because it was folded into mm-oom-prefer-thread-group-leaders-for-display-purposes.patch
------------------------------------------------------
From: David Rientjes <rientjes@xxxxxxxxxx>
Subject: mm, oom: prefer thread group leaders for display purposes fix
If oom_badness() returns 0 for an oom disabled process before a process
has actually been chosen for kill, there will be a NULL pointer
dereference when doing thread_group_leader(chosen).
Make sure oom disabled processes aren't even considered to prevent the
bug.
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
Reported-by: Greg Thelen <gthelen@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 2 +-
mm/oom_kill.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/memcontrol.c~mm-oom-prefer-thread-group-leaders-for-display-purposes-fix mm/memcontrol.c
--- a/mm/memcontrol.c~mm-oom-prefer-thread-group-leaders-for-display-purposes-fix
+++ a/mm/memcontrol.c
@@ -1841,7 +1841,7 @@ static void mem_cgroup_out_of_memory(str
break;
};
points = oom_badness(task, memcg, NULL, totalpages);
- if (points < chosen_points)
+ if (!points || points < chosen_points)
continue;
/* Prefer thread group leaders for display purposes */
if (points == chosen_points &&
diff -puN mm/oom_kill.c~mm-oom-prefer-thread-group-leaders-for-display-purposes-fix mm/oom_kill.c
--- a/mm/oom_kill.c~mm-oom-prefer-thread-group-leaders-for-display-purposes-fix
+++ a/mm/oom_kill.c
@@ -327,7 +327,7 @@ static struct task_struct *select_bad_pr
break;
};
points = oom_badness(p, NULL, nodemask, totalpages);
- if (points < chosen_points)
+ if (!points || points < chosen_points)
continue;
/* Prefer thread group leaders for display purposes */
if (points == chosen_points && thread_group_leader(chosen))
_
Patches currently in -mm which might be from rientjes@xxxxxxxxxx are
origin.patch
fs-proc-pagec-add-pageanon-check-to-surely-detect-thp.patch
mm-prevent-setting-of-a-value-less-than-0-to-min_free_kbytes.patch
mm-show-message-when-updating-min_free_kbytes-in-thp.patch
mm-oom-prefer-thread-group-leaders-for-display-purposes.patch
uapi-convert-u64-to-__u64-in-exported-headers.patch
checkpatch-add-warning-of-future-__gfp_nofail-use.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
