projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f2dbe03
)
x86: fix leak un ioremap_page_range() failure
author
Ingo Molnar
<mingo@elte.hu>
Thu, 28 Feb 2008 13:02:08 +0000
(14:02 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 29 Feb 2008 17:55:42 +0000
(18:55 +0100)
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>
arch/x86/mm/ioremap.c
patch
|
blob
|
history
diff --git
a/arch/x86/mm/ioremap.c
b/arch/x86/mm/ioremap.c
index
882328e
..
ac3c959
100644
(file)
--- a/
arch/x86/mm/ioremap.c
+++ b/
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;
vaddr = (unsigned long) area->addr;
if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
-
remove_vm_area((void *)(vaddr & PAGE_MASK)
);
+
free_vm_area(area
);
return NULL;
}