]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
kmemleak: Inform kmemleak about pid_hash
authorCatalin Marinas <catalin.marinas@arm.com>
Mon, 29 Jun 2009 16:13:55 +0000 (17:13 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Mon, 29 Jun 2009 16:14:14 +0000 (17:14 +0100)
Kmemleak does not track alloc_bootmem calls but the pid_hash allocated
in pidhash_init() would need to be scanned as it contains pointers to
struct pid objects.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
kernel/pid.c

index 31310b5d3f50325ed75a6e54b94fc715d63698fa..5fa1db48d8b70c686462fc7315b833efe503d101 100644 (file)
@@ -36,6 +36,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/init_task.h>
 #include <linux/syscalls.h>
+#include <linux/kmemleak.h>
 
 #define pid_hashfn(nr, ns)     \
        hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
@@ -512,6 +513,12 @@ void __init pidhash_init(void)
        pid_hash = alloc_bootmem(pidhash_size * sizeof(*(pid_hash)));
        if (!pid_hash)
                panic("Could not alloc pidhash!\n");
+       /*
+        * pid_hash contains references to allocated struct pid objects and it
+        * must be scanned by kmemleak to avoid false positives.
+        */
+       kmemleak_alloc(pid_hash, pidhash_size * sizeof(*(pid_hash)), 0,
+                      GFP_KERNEL);
        for (i = 0; i < pidhash_size; i++)
                INIT_HLIST_HEAD(&pid_hash[i]);
 }