Subject: go BUG on vmallocspace in __pa()

Add checks to __pa() so it goes BUG() on vmallocspace addresses.


Index: linux-2.6/include/asm-i386/page.h
===================================================================
--- linux-2.6.orig/include/asm-i386/page.h	2007-03-03 05:17:54.000000000 -0800
+++ linux-2.6/include/asm-i386/page.h	2007-03-03 05:25:09.000000000 -0800
@@ -118,11 +118,17 @@
 #define __PAGE_OFFSET		((unsigned long)CONFIG_PAGE_OFFSET)
 #endif
 
-
 #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
+
+#ifdef __ASSEMBLY__
+#define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
+#else
+extern unsigned long __kvaddr_to_paddr(unsigned long);
+#define __pa(x)			__kvaddr_to_paddr((unsigned long)(x))
+#endif
+
 #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
 #define MAXMEM			(-__PAGE_OFFSET-__VMALLOC_RESERVE)
-#define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
 /* __pa_symbol should be used for C visible symbols.
    This seems to be the official gcc blessed way to do such arithmetic. */
 #define __pa_symbol(x)          __pa(RELOC_HIDE((unsigned long)(x),0))
Index: linux-2.6/arch/i386/mm/pgtable.c
===================================================================
--- linux-2.6.orig/arch/i386/mm/pgtable.c	2007-03-03 05:17:54.000000000 -0800
+++ linux-2.6/arch/i386/mm/pgtable.c	2007-03-03 05:56:05.000000000 -0800
@@ -181,6 +181,15 @@
 #endif
 }
 
+unsigned long __kvaddr_to_paddr(unsigned long kvaddr)
+{
+	if (high_memory)
+		BUG_ON(kvaddr >= VMALLOC_START);
+	else
+		BUG_ON(kvaddr >= (unsigned long)__va(MAXMEM));
+	return kvaddr - PAGE_OFFSET;
+}
+
 pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
 	return (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
Index: linux-2.6/arch/i386/kernel/doublefault.c
===================================================================
--- linux-2.6.orig/arch/i386/kernel/doublefault.c	2007-03-03 05:17:54.000000000 -0800
+++ linux-2.6/arch/i386/kernel/doublefault.c	2007-03-03 05:25:09.000000000 -0800
@@ -62,5 +62,5 @@
 	.ss		= __KERNEL_DS,
 	.ds		= __USER_DS,
 
-	.__cr3		= __pa(swapper_pg_dir)
+	.__cr3		= (unsigned long)swapper_pg_dir - PAGE_OFFSET,
 };