lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pid namespaces: create a slab-cache for 'struct pid_namespace'

Browse Source 
This will help fixing memory leaks due to bad reference counting.

Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sukadev Bhattiprolu
2007-10-18 23:40:12 -07:00
committed by Linus Torvalds
parent 6f4e643353
commit c9c5d92211
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/pid.c
View File

@@ -40,6 +40,7 @@
static struct hlist_head *pid_hash; static struct hlist_head *pid_hash;
static int pidhash_shift; static int pidhash_shift;
struct pid init_struct_pid = INIT_STRUCT_PID; struct pid init_struct_pid = INIT_STRUCT_PID;
static struct kmem_cache *pid_ns_cachep;
int pid_max = PID_MAX_DEFAULT; int pid_max = PID_MAX_DEFAULT;
@@ -486,7 +487,7 @@ static struct pid_namespace *create_pid_namespace(int level)
struct pid_namespace *ns; struct pid_namespace *ns;
int i; int i;
ns = kmalloc(sizeof(struct pid_namespace), GFP_KERNEL); ns = kmem_cache_alloc(pid_ns_cachep, GFP_KERNEL);
if (ns == NULL) if (ns == NULL)
goto out; goto out;
@@ -516,7 +517,7 @@ static struct pid_namespace *create_pid_namespace(int level)
out_free_map: out_free_map:
kfree(ns->pidmap[0].page); kfree(ns->pidmap[0].page);
out_free: out_free:
kfree(ns); kmem_cache_free(pid_ns_cachep, ns);
out: out:
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
@@ -527,7 +528,7 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
for (i = 0; i < PIDMAP_ENTRIES; i++) for (i = 0; i < PIDMAP_ENTRIES; i++)
kfree(ns->pidmap[i].page); kfree(ns->pidmap[i].page);
kfree(ns); kmem_cache_free(pid_ns_cachep, ns);
} }
struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns) struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
@@ -601,4 +602,6 @@ void __init pidmap_init(void)
init_pid_ns.pid_cachep = create_pid_cachep(1); init_pid_ns.pid_cachep = create_pid_cachep(1);
if (init_pid_ns.pid_cachep == NULL) if (init_pid_ns.pid_cachep == NULL)
panic("Can't create pid_1 cachep\n"); panic("Can't create pid_1 cachep\n");
pid_ns_cachep = KMEM_CACHE(pid_namespace, SLAB_PANIC);
} }