From: David S. Miller <davem@davemloft.net>
Date: Wed, 3 Sep 2008 08:20:37 +0000 (-0700)
Subject: sparc64: Fix overshoot in nid_range().
X-Git-Tag: v2.6.26.4~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d77cfb999845251dd6271b0e3ccf89eba26b3e2;p=thirdparty%2Fkernel%2Fstable.git

sparc64: Fix overshoot in nid_range().

[ Upstream commit c918dcce92f76bb9903e4d049f4780bad384c207 ]

If 'start' does not begin on a page boundary, we can overshoot
past 'end'.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index e289a985af840..c2094e1914356 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -842,6 +842,9 @@ static unsigned long nid_range(unsigned long start, unsigned long end,
 		start += PAGE_SIZE;
 	}
 
+	if (start > end)
+		start = end;
+
 	return start;
 }
 #else