Parcourir la source

x86: fix leak un ioremap_page_range() failure

Jan Beulich noticed it during code review that if a driver's ioremap()
fails (say due to -ENOMEM) then we might leak the struct vm_area.

Free it properly.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar il y a 17 ans
Parent
commit
b16bf712f4
1 fichiers modifiés avec 1 ajouts et 1 suppressions
  1. 1 1
      arch/x86/mm/ioremap.c

+ 1 - 1
arch/x86/mm/ioremap.c

@@ -162,7 +162,7 @@ static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
 	area->phys_addr = phys_addr;
 	area->phys_addr = phys_addr;
 	vaddr = (unsigned long) area->addr;
 	vaddr = (unsigned long) area->addr;
 	if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
 	if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
-		remove_vm_area((void *)(vaddr & PAGE_MASK));
+		free_vm_area(area);
 		return NULL;
 		return NULL;
 	}
 	}