lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] x86_64: Bug correction in populate_memnodemap()

Browse Source 
As reported by Keith Mannthey, there are problems in populate_memnodemap()

The bug was that the compute_hash_shift() was returning 31, with incorrect
initialization of memnodemap[]

To correct the bug, we must use (1UL << shift) instead of (1 << shift) to
avoid an integer overflow, and we must check that shift < 64 to avoid an
infinite loop.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Eric Dumazet
2005-12-12 22:17:14 -08:00
committed by Linus Torvalds
parent fd4954714e
commit 8309cf66fd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86_64/mm/numa.c
View File

@@ -53,6 +53,8 @@ static int __init populate_memnodemap(
int res = -1; int res = -1;
unsigned long addr, end; unsigned long addr, end;
if (shift >= 64)
return -1;
memset(memnodemap, 0xff, sizeof(memnodemap)); memset(memnodemap, 0xff, sizeof(memnodemap));
for (i = 0; i < numnodes; i++) { for (i = 0; i < numnodes; i++) {
addr = nodes[i].start; addr = nodes[i].start;
@@ -65,7 +67,7 @@ static int __init populate_memnodemap(
if (memnodemap[addr >> shift] != 0xff) if (memnodemap[addr >> shift] != 0xff)
return -1; return -1;
memnodemap[addr >> shift] = i; memnodemap[addr >> shift] = i;
addr += (1 << shift); addr += (1UL << shift);
} while (addr < end); } while (addr < end);
res = 1; res = 1;
} }