lkml.org 
[lkml]   [2008]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 08/15] kmemleak: Add modules support
    From
    Date
    This patch handles the kmemleak operations needed for modules loading so
    that memory allocations from inside a module are properly tracked.

    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    ---
    kernel/module.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
    1 files changed, 56 insertions(+), 0 deletions(-)
    diff --git a/kernel/module.c b/kernel/module.c
    index 1f4cc00..7198681 100644
    --- a/kernel/module.c
    +++ b/kernel/module.c
    @@ -51,6 +51,7 @@
    #include <asm/sections.h>
    #include <linux/tracepoint.h>
    #include <linux/ftrace.h>
    +#include <linux/memleak.h>

    #if 0
    #define DEBUGP printk
    @@ -409,6 +410,7 @@ static void *percpu_modalloc(unsigned long size, unsigned long align,
    unsigned long extra;
    unsigned int i;
    void *ptr;
    + int cpu;

    if (align > PAGE_SIZE) {
    printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
    @@ -438,6 +440,11 @@ static void *percpu_modalloc(unsigned long size, unsigned long align,
    if (!split_block(i, size))
    return NULL;

    + /* add the per-cpu scanning areas */
    + for_each_possible_cpu(cpu)
    + memleak_alloc(ptr + per_cpu_offset(cpu), size, 0,
    + GFP_KERNEL);
    +
    /* Mark allocated */
    pcpu_size[i] = -pcpu_size[i];
    return ptr;
    @@ -452,6 +459,7 @@ static void percpu_modfree(void *freeme)
    {
    unsigned int i;
    void *ptr = __per_cpu_start + block_size(pcpu_size[0]);
    + int cpu;

    /* First entry is core kernel percpu data. */
    for (i = 1; i < pcpu_num_used; ptr += block_size(pcpu_size[i]), i++) {
    @@ -463,6 +471,10 @@ static void percpu_modfree(void *freeme)
    BUG();

    free:
    + /* remove the per-cpu scanning areas */
    + for_each_possible_cpu(cpu)
    + memleak_free(freeme + per_cpu_offset(cpu));
    +
    /* Merge with previous? */
    if (pcpu_size[i-1] >= 0) {
    pcpu_size[i-1] += pcpu_size[i];
    @@ -1833,6 +1845,36 @@ static void *module_alloc_update_bounds(unsigned long size)
    return ret;
    }

    +#ifdef CONFIG_DEBUG_MEMLEAK
    +static void memleak_load_module(struct module *mod, Elf_Ehdr *hdr,
    + Elf_Shdr *sechdrs, char *secstrings)
    +{
    + unsigned int i;
    +
    + /* only scan the sections containing data */
    + memleak_scan_area(mod->module_core,
    + (unsigned long)mod - (unsigned long)mod->module_core,
    + sizeof(struct module), GFP_KERNEL);
    +
    + for (i = 1; i < hdr->e_shnum; i++) {
    + if (!(sechdrs[i].sh_flags & SHF_ALLOC))
    + continue;
    + if (strncmp(secstrings + sechdrs[i].sh_name, ".data", 5) != 0
    + && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0)
    + continue;
    +
    + memleak_scan_area(mod->module_core, sechdrs[i].sh_addr -
    + (unsigned long)mod->module_core,
    + sechdrs[i].sh_size, GFP_KERNEL);
    + }
    +}
    +#else
    +static inline void memleak_load_module(struct module *mod, Elf_Ehdr *hdr,
    + Elf_Shdr *sechdrs, char *secstrings)
    +{
    +}
    +#endif
    +
    /* Allocate and load the module: note that size of section 0 is always
    zero, and we rely on this for optional sections. */
    static noinline struct module *load_module(void __user *umod,
    @@ -2011,6 +2053,12 @@ static noinline struct module *load_module(void __user *umod,

    /* Do the allocs. */
    ptr = module_alloc_update_bounds(mod->core_size);
    + /*
    + * The pointer to this block is stored in the module structure
    + * which is inside the block. Just mark it as not being a
    + * leak.
    + */
    + memleak_not_leak(ptr);
    if (!ptr) {
    err = -ENOMEM;
    goto free_percpu;
    @@ -2019,6 +2067,13 @@ static noinline struct module *load_module(void __user *umod,
    mod->module_core = ptr;

    ptr = module_alloc_update_bounds(mod->init_size);
    + /*
    + * The pointer to this block is stored in the module structure
    + * which is inside the block. This block doesn't need to be
    + * scanned as it contains data and code that will be freed
    + * after the module is initialized.
    + */
    + memleak_ignore(ptr);
    if (!ptr && mod->init_size) {
    err = -ENOMEM;
    goto free_core;
    @@ -2049,6 +2104,7 @@ static noinline struct module *load_module(void __user *umod,
    }
    /* Module has been moved. */
    mod = (void *)sechdrs[modindex].sh_addr;
    + memleak_load_module(mod, hdr, sechdrs, secstrings);

    /* Now we've moved module, initialize linked lists, etc. */
    module_unload_init(mod);


    \
     
     \ /
      Last update: 2008-12-10 19:33    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site