Skip to content

Commit

Permalink
slub: Add method to verify memory is not freed
Browse files Browse the repository at this point in the history
This is for tracking down suspect memory usage.

Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
  • Loading branch information
Ben Greear authored and Pekka Enberg committed Jul 7, 2011
1 parent d6543e3 commit d18a90d
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 0 deletions.
13 changes: 13 additions & 0 deletions include/linux/slub_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,19 @@ kmalloc_order(size_t size, gfp_t flags, unsigned int order)
return ret;
}

/**
* Calling this on allocated memory will check that the memory
* is expected to be in use, and print warnings if not.
*/
#ifdef CONFIG_SLUB_DEBUG
extern bool verify_mem_not_deleted(const void *x);
#else
static inline bool verify_mem_not_deleted(const void *x)
{
return true;
}
#endif

#ifdef CONFIG_TRACING
extern void *
kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size);
Expand Down
36 changes: 36 additions & 0 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -2964,6 +2964,42 @@ size_t ksize(const void *object)
}
EXPORT_SYMBOL(ksize);

#ifdef CONFIG_SLUB_DEBUG
bool verify_mem_not_deleted(const void *x)
{
struct page *page;
void *object = (void *)x;
unsigned long flags;
bool rv;

if (unlikely(ZERO_OR_NULL_PTR(x)))
return false;

local_irq_save(flags);

page = virt_to_head_page(x);
if (unlikely(!PageSlab(page))) {
/* maybe it was from stack? */
rv = true;
goto out_unlock;
}

slab_lock(page);
if (on_freelist(page->slab, page, object)) {
object_err(page->slab, page, object, "Object is on free-list");
rv = false;
} else {
rv = true;
}
slab_unlock(page);

out_unlock:
local_irq_restore(flags);
return rv;
}
EXPORT_SYMBOL(verify_mem_not_deleted);
#endif

void kfree(const void *x)
{
struct page *page;
Expand Down

0 comments on commit d18a90d

Please sign in to comment.