diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-27 19:33:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-09 13:26:39 -0800 |
| commit | 9a22026c32345ff03b8a5a7edc02dbf8c98aa51f (patch) | |
| tree | 66bfa13669f75c64296d4fc59181aef4ff030606 /mm | |
| parent | 87e8f969fc693c8ccb8ecb440634f84c87428fd7 (diff) | |
numa: fix slab_node(MPOL_BIND)
commit 800416f799e0723635ac2d720ad4449917a1481c upstream.
When a node contains only HighMem memory, slab_node(MPOL_BIND)
dereferences a NULL pointer.
[ This code seems to go back all the way to commit 19770b32609b: "mm:
filter based on a nodemask as well as a gfp_mask". Which was back in
April 2008, and it got merged into 2.6.26. - Linus ]
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <cl@linux.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mempolicy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index f29d8d70884d..3c6e3e29255c 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1482,7 +1482,7 @@ unsigned slab_node(struct mempolicy *policy) (void)first_zones_zonelist(zonelist, highest_zoneidx, &policy->v.nodes, &zone); - return zone->node; + return zone ? zone->node : numa_node_id(); } default: |