openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

parisc: Fix vmap memory leak in ioremap()/iounmap() 

Sven noticed that calling ioremap() and iounmap() multiple times leads
to a vmap memory leak:
	vmap allocation for size 4198400 failed:
	use vmalloc=<size> to increase size

It seems we missed calling vunmap() in iounmap().

Signed-off-by: Helge Deller <deller@gmx.de>
Noticed-by: Sven Schnelle <svens@stackframe.org>
Cc: <stable@vger.kernel.org> # v3.16+
This commit is contained in:
Helge Deller 2019-10-04 19:23:37 +02:00
parent 0703ad217e
commit 513f7f747e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/parisc/mm/ioremap.c
View File

@ -3,7 +3,7 @@
* arch/parisc/mm/ioremap.c * arch/parisc/mm/ioremap.c
* *
* (C) Copyright 1995 1996 Linus Torvalds * (C) Copyright 1995 1996 Linus Torvalds
* (C) Copyright 2001-2006 Helge Deller <deller@gmx.de> * (C) Copyright 2001-2019 Helge Deller <deller@gmx.de>
* (C) Copyright 2005 Kyle McMartin <kyle@parisc-linux.org> * (C) Copyright 2005 Kyle McMartin <kyle@parisc-linux.org>
*/ */
@ -84,7 +84,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
addr = (void __iomem *) area->addr; addr = (void __iomem *) area->addr;
if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size, if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
phys_addr, pgprot)) { phys_addr, pgprot)) {
vfree(addr); vunmap(addr);
return NULL; return NULL;
} }
@ -92,9 +92,11 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
} }
EXPORT_SYMBOL(__ioremap); EXPORT_SYMBOL(__ioremap);
void iounmap(const volatile void __iomem *addr) void iounmap(const volatile void __iomem *io_addr)
{ {
if (addr > high_memory) unsigned long addr = (unsigned long)io_addr & PAGE_MASK;
return vfree((void *) (PAGE_MASK & (unsigned long __force) addr));
if (is_vmalloc_addr((void *)addr))
vunmap((void *)addr);
} }
EXPORT_SYMBOL(iounmap); EXPORT_SYMBOL(iounmap);