Skip to contentSkip to conversation

Fix possible variable overflow in NUMA code

PATCH New Yang, Xiaowei 1 participant 1 message Apr 23, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix possible variable overflow in NUMA code

On PAE system, when "<<" operation is used on type "long" to get a 64-bit value, the result could be overflowed.

Thanks,
xiaowei

xen/arch/x86/numa.c Thu Apr 23 13:57:17 2009 +0800 renamed from xen/arch/x86/numa.c Tue Apr 21 17:03:23 2009 +0800 +3 -3
diff -r dd91d71d4eca xen/arch/x86/numa.c
@@ -74,7 +74,7 @@ populate_memnodemap(const struct node *n
                        if (memnodemap[addr >> shift] != 0xff)
                                return -1;
                        memnodemap[addr >> shift] = i;
-                       addr += (1UL << shift);
+                       addr += (1ULL << shift);
                } while (addr < end);
                res = 1;
        }
@@ -290,7 +290,7 @@ static void dump_numa(unsigned char key)
                  (u32)(now>>32), (u32)now);
 
        for_each_online_node(i) {
-               paddr_t pa = (NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT;
+               paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1) << PAGE_SHIFT;
                printk("idx%d -> NODE%d start->%lu size->%lu\n",
                          i, NODE_DATA(i)->node_id,
                          NODE_DATA(i)->node_start_pfn,
@@ -314,7 +314,7 @@ static void dump_numa(unsigned char key)
 
                page_list_for_each(page, &d->page_list)
                {
-                       i = phys_to_nid(page_to_mfn(page) << PAGE_SHIFT);
+                       i = phys_to_nid((paddr_t)page_to_mfn(page) << PAGE_SHIFT);
                        page_num_node[i]++;
                }