瀏覽代碼

[PATCH] powerpc: IOMMU: don't ioremap null addresses

240-ioremap-null-ptr-test.patch

Under highly unusual circumstances, a buggy driver will ask a null ptr
to be ioremapped, an operation that curently succeeds but leads to
later trouble.  Instead, refuse to remap the null pointer.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
(cherry picked from e71d9e598533c1889e7162f5f4647e5d378c102c commit)
Linas Vepstas 19 年之前
父節點
當前提交
d177c207ba
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/powerpc/mm/pgtable_64.c

+ 1 - 1
arch/powerpc/mm/pgtable_64.c

@@ -174,7 +174,7 @@ void __iomem * __ioremap(unsigned long addr, unsigned long size,
 	pa = addr & PAGE_MASK;
 	pa = addr & PAGE_MASK;
 	size = PAGE_ALIGN(addr + size) - pa;
 	size = PAGE_ALIGN(addr + size) - pa;
 
 
-	if (size == 0)
+	if ((size == 0) || (pa == 0))
 		return NULL;
 		return NULL;
 
 
 	if (mem_init_done) {
 	if (mem_init_done) {