mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 19:31:53 +00: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/20190103145954.16942-3-rpenyaev@suse.de Signed-off-by: Roman Penyaev <rpenyaev@suse.de> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Joe Perches <joe@perches.com> Cc: "Luis R. Rodriguez" <mcgrof@kernel.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
401592d2e0
commit
c67dc62475
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 New Issue
Block a user