From 0d6038baf4632c9ada01c430765e314885721608 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Feb 2010 16:16:50 -0800
Subject: [PATCH] --- yaml --- r: 180305 b: refs/heads/master c:
 6f5a55f1a6c5abee15a0e878e5c74d9f1569b8b0 h: refs/heads/master i:   180303:
 bfade322d3786bc1fb5cd29d6003e4fe6a195662 v: v3

---
 [refs]             | 2 +-
 trunk/mm/migrate.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 186ed7ce4e9c..f23f52e7d969 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d9c3a51e7b20dcd63b8cc534035af99a41d03e4
+refs/heads/master: 6f5a55f1a6c5abee15a0e878e5c74d9f1569b8b0
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index efddbf0926b2..9a0db5bbabe4 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -912,6 +912,9 @@ static int do_pages_move(struct mm_struct *mm, struct task_struct *task,
 				goto out_pm;
 
 			err = -ENODEV;
+			if (node < 0 || node >= MAX_NUMNODES)
+				goto out_pm;
+
 			if (!node_state(node, N_HIGH_MEMORY))
 				goto out_pm;