mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
kmemleak: Trace the kmalloc_large* functions in slub
The kmalloc_large() and kmalloc_large_node() functions were missed when adding the kmemleak hooks to the slub allocator. However, they should be traced to avoid false positives. Signed-off-by: Catalin Marinas <[email protected]> Cc: Christoph Lameter <[email protected]> Acked-by: Pekka Enberg <[email protected]>
This commit is contained in:
parent
2587362eaf
commit
e4f7c0b44a
2 changed files with 8 additions and 4 deletions
10
mm/slub.c
10
mm/slub.c
|
|
@ -21,7 +21,6 @@
|
|||
#include <linux/kmemcheck.h>
|
||||
#include <linux/cpu.h>
|
||||
#include <linux/cpuset.h>
|
||||
#include <linux/kmemleak.h>
|
||||
#include <linux/mempolicy.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/debugobjects.h>
|
||||
|
|
@ -2835,13 +2834,15 @@ EXPORT_SYMBOL(__kmalloc);
|
|||
static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
|
||||
{
|
||||
struct page *page;
|
||||
void *ptr = NULL;
|
||||
|
||||
flags |= __GFP_COMP | __GFP_NOTRACK;
|
||||
page = alloc_pages_node(node, flags, get_order(size));
|
||||
if (page)
|
||||
return page_address(page);
|
||||
else
|
||||
return NULL;
|
||||
ptr = page_address(page);
|
||||
|
||||
kmemleak_alloc(ptr, size, 1, flags);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NUMA
|
||||
|
|
@ -2926,6 +2927,7 @@ void kfree(const void *x)
|
|||
page = virt_to_head_page(x);
|
||||
if (unlikely(!PageSlab(page))) {
|
||||
BUG_ON(!PageCompound(page));
|
||||
kmemleak_free(x);
|
||||
put_page(page);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue