[kernel] r16508 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Sat Oct 30 08:51:59 2010
New Revision: 16508

Log:
numa: fix slab_node(MPOL_BIND)

also should apply to 2.6.26

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/numa-fix-slab_node-MPOL_BIND.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/27

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Oct 30 08:49:35 2010	(r16507)
+++ dists/sid/linux-2.6/debian/changelog	Sat Oct 30 08:51:59 2010	(r16508)
@@ -49,6 +49,7 @@
     - drm/i915: Unset cursor if out-of-bounds upon mode change (v4)
     - drm/i915,agp/intel: Add second set of PCI-IDs for B43
   * net: Limit socket I/O iovec total length to INT_MAX.
+  * numa: fix slab_node(MPOL_BIND).
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 19 Oct 2010 23:27:23 +0100
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/numa-fix-slab_node-MPOL_BIND.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/numa-fix-slab_node-MPOL_BIND.patch	Sat Oct 30 08:51:59 2010	(r16508)
@@ -0,0 +1,39 @@
+From 800416f799e0723635ac2d720ad4449917a1481c Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <eric.dumazet at gmail.com>
+Date: Wed, 27 Oct 2010 19:33:43 +0200
+Subject: [PATCH] numa: fix slab_node(MPOL_BIND)
+
+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 at gmail.com>
+Cc: Mel Gorman <mel at csn.ul.ie>
+Cc: Christoph Lameter <cl at linux.com>
+Cc: Lee Schermerhorn <lee.schermerhorn at hp.com>
+Cc: Andrew Morton <akpm at linux-foundation.org>
+Cc: stable at kernel.org
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ mm/mempolicy.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mm/mempolicy.c b/mm/mempolicy.c
+index 81a1276..4a57f13 100644
+--- a/mm/mempolicy.c
++++ b/mm/mempolicy.c
+@@ -1597,7 +1597,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:
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/27	Sat Oct 30 08:49:35 2010	(r16507)
+++ dists/sid/linux-2.6/debian/patches/series/27	Sat Oct 30 08:51:59 2010	(r16508)
@@ -21,3 +21,4 @@
 + bugfix/all/drm-i915-agp-intel-Add-second-set-of-PCI-IDs-for-B43.patch
 + bugfix/all/net-Limit-socket-I-O-iovec-total-length-to-INT_MAX.patch
 + bugfix/all/net-socket-limit-sendto-recvfrom-length.patch
++ bugfix/all/numa-fix-slab_node-MPOL_BIND.patch