Skip to contentSkip to conversation

metag: off by one in setup_bootmem_node()

PATCH Applied Dan Carpenter 2 participants 2 messages Nov 8, 2013 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 metag: off by one in setup_bootmem_node()

If "nid = MAX_NUMNODES" then we write beyond the end of the node_data[] array.

arch/metag/mm/numa.c +1 -1
index 9ae578c..b172aa4 100644
@@ -34,7 +34,7 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
 	unsigned long pgdat_paddr;
 
 	/* Don't allow bogus node assignment */
-	BUG_ON(nid > MAX_NUMNODES || nid <= 0);
+	BUG_ON(nid >= MAX_NUMNODES || nid <= 0);
 
 	start_pfn = start >> PAGE_SHIFT;
 	end_pfn = end >> PAGE_SHIFT;
Applied
#1 lore raw
Quoted 10 lines · Dan Carpenter

If "nid = MAX_NUMNODES" then we write beyond the end of the node_data[] array.

arch/metag/mm/numa.c +0 -0
index 9ae578c..b172aa4 100644

arch/metag/mm/numa.c void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) · line 40

Quoted 8 lines
arch/metag/mm/numa.c +1 -1
@@ -34,7 +34,7 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
 	unsigned long pgdat_paddr;
 
 	/* Don't allow bogus node assignment */
-	BUG_ON(nid > MAX_NUMNODES || nid <= 0);
+	BUG_ON(nid >= MAX_NUMNODES || nid <= 0);
 
 	start_pfn = start >> PAGE_SHIFT;
 	end_pfn = end >> PAGE_SHIFT;

Thanks, Applied for v3.13.

Cheers
James