Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

asm-generic: add an optional pfn_valid check to page_to_phys

page_to_pfn is usually implemented by pointer arithmetics on the memory
map, which means that bogus input can lead to even more bogus output.

Powerpc had a pfn_valid check on the intermediate pfn in the page_to_phys
implementation when CONFIG_DEBUG_VIRTUAL is defined, which seems
generally useful, so add that to the generic version.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Christoph Hellwig and committed by
Arnd Bergmann
3e25d5a4 c5c3238d

+10
+10
include/asm-generic/memory_model.h
··· 64 64 #define page_to_pfn __page_to_pfn 65 65 #define pfn_to_page __pfn_to_page 66 66 67 + #ifdef CONFIG_DEBUG_VIRTUAL 68 + #define page_to_phys(page) \ 69 + ({ \ 70 + unsigned long __pfn = page_to_pfn(page); \ 71 + \ 72 + WARN_ON_ONCE(!pfn_valid(__pfn)); \ 73 + PFN_PHYS(__pfn); \ 74 + }) 75 + #else 67 76 #define page_to_phys(page) PFN_PHYS(page_to_pfn(page)) 77 + #endif /* CONFIG_DEBUG_VIRTUAL */ 68 78 #define phys_to_page(phys) pfn_to_page(PHYS_PFN(phys)) 69 79 70 80 #endif /* __ASSEMBLY__ */