diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 16:16:50 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 15:52:15 -0700 |
commit | ffa211737de4c26d0d6fd61091d59acfcac1d03a (patch) | |
tree | cd800929f684f67a8adae40b9b6f5fa21cdc6305 /mm | |
parent | 69f4dd6978cc487e49360c50dce75a267a99f3d5 (diff) |
Fix potential crash with sys_move_pages
commit 6f5a55f1a6c5abee15a0e878e5c74d9f1569b8b0 upstream.
We incorrectly depended on the 'node_state/node_isset()' functions
testing the node range, rather than checking it explicitly. That's not
reliable, even if it might often happen to work. So do the proper
explicit test.
Reported-by: Marcus Meissner <meissner@suse.de>
Acked-and-tested-by: Brice Goglin <Brice.Goglin@inria.fr>
Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
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/migrate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index d493c02d4e4a..96178f4c1215 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1062,6 +1062,9 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, goto out; err = -ENODEV; + if (node < 0 || node >= MAX_NUMNODES) + goto out; + if (!node_state(node, N_HIGH_MEMORY)) goto out; |