mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
mm/vmalloc: do not call kmemleak_free() on not yet accounted memory
__vmalloc_area_node() calls vfree() on error path, which in turn calls kmemleak_free(), but area is not yet accounted by kmemleak_vmalloc(). Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Roman Penyaev <[email protected]> Reviewed-by: Andrew Morton <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Andrey Ryabinin <[email protected]> Cc: Joe Perches <[email protected]> Cc: "Luis R. Rodriguez" <[email protected]> Cc: Catalin Marinas <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
401592d2e0
commit
c67dc62475
1 changed files with 11 additions and 5 deletions
16
mm/vmalloc.c
16
mm/vmalloc.c
|
|
@ -1565,6 +1565,14 @@ void vfree_atomic(const void *addr)
|
|||
__vfree_deferred(addr);
|
||||
}
|
||||
|
||||
static void __vfree(const void *addr)
|
||||
{
|
||||
if (unlikely(in_interrupt()))
|
||||
__vfree_deferred(addr);
|
||||
else
|
||||
__vunmap(addr, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* vfree - release memory allocated by vmalloc()
|
||||
* @addr: memory base address
|
||||
|
|
@ -1591,10 +1599,8 @@ void vfree(const void *addr)
|
|||
|
||||
if (!addr)
|
||||
return;
|
||||
if (unlikely(in_interrupt()))
|
||||
__vfree_deferred(addr);
|
||||
else
|
||||
__vunmap(addr, 1);
|
||||
|
||||
__vfree(addr);
|
||||
}
|
||||
EXPORT_SYMBOL(vfree);
|
||||
|
||||
|
|
@ -1709,7 +1715,7 @@ fail:
|
|||
warn_alloc(gfp_mask, NULL,
|
||||
"vmalloc: allocation failure, allocated %ld of %ld bytes",
|
||||
(area->nr_pages*PAGE_SIZE), area->size);
|
||||
vfree(area->addr);
|
||||
__vfree(area->addr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue