diff options
author | Sukadev Bhattiprolu <sukadev@us.ibm.com> | 2007-10-19 02:40:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:40 -0400 |
commit | c9c5d92211883e9ae22394d1f157ab0d3a7ec895 (patch) | |
tree | bd90ede8e80a59bcb2dfedbc3248e5091736526c | |
parent | 6f4e643353aea52d80f33960bd88954a7c074f0f (diff) |
pid namespaces: create a slab-cache for 'struct pid_namespace'
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>
-rw-r--r-- | kernel/pid.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index f76097c60475..d88b83eb703e 100644 --- a/kernel/pid.c +++ b/kernel/pid.c | |||
@@ -40,6 +40,7 @@ | |||
40 | static struct hlist_head *pid_hash; | 40 | static struct hlist_head *pid_hash; |
41 | static int pidhash_shift; | 41 | static int pidhash_shift; |
42 | struct pid init_struct_pid = INIT_STRUCT_PID; | 42 | struct pid init_struct_pid = INIT_STRUCT_PID; |
43 | static struct kmem_cache *pid_ns_cachep; | ||
43 | 44 | ||
44 | int pid_max = PID_MAX_DEFAULT; | 45 | int pid_max = PID_MAX_DEFAULT; |
45 | 46 | ||
@@ -486,7 +487,7 @@ static struct pid_namespace *create_pid_namespace(int level) | |||
486 | struct pid_namespace *ns; | 487 | struct pid_namespace *ns; |
487 | int i; | 488 | int i; |
488 | 489 | ||
489 | ns = kmalloc(sizeof(struct pid_namespace), GFP_KERNEL); | 490 | ns = kmem_cache_alloc(pid_ns_cachep, GFP_KERNEL); |
490 | if (ns == NULL) | 491 | if (ns == NULL) |
491 | goto out; | 492 | goto out; |
492 | 493 | ||
@@ -516,7 +517,7 @@ static struct pid_namespace *create_pid_namespace(int level) | |||
516 | out_free_map: | 517 | out_free_map: |
517 | kfree(ns->pidmap[0].page); | 518 | kfree(ns->pidmap[0].page); |
518 | out_free: | 519 | out_free: |
519 | kfree(ns); | 520 | kmem_cache_free(pid_ns_cachep, ns); |
520 | out: | 521 | out: |
521 | return ERR_PTR(-ENOMEM); | 522 | return ERR_PTR(-ENOMEM); |
522 | } | 523 | } |
@@ -527,7 +528,7 @@ static void destroy_pid_namespace(struct pid_namespace *ns) | |||
527 | 528 | ||
528 | for (i = 0; i < PIDMAP_ENTRIES; i++) | 529 | for (i = 0; i < PIDMAP_ENTRIES; i++) |
529 | kfree(ns->pidmap[i].page); | 530 | kfree(ns->pidmap[i].page); |
530 | kfree(ns); | 531 | kmem_cache_free(pid_ns_cachep, ns); |
531 | } | 532 | } |
532 | 533 | ||
533 | struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns) | 534 | struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns) |
@@ -601,4 +602,6 @@ void __init pidmap_init(void) | |||
601 | init_pid_ns.pid_cachep = create_pid_cachep(1); | 602 | init_pid_ns.pid_cachep = create_pid_cachep(1); |
602 | if (init_pid_ns.pid_cachep == NULL) | 603 | if (init_pid_ns.pid_cachep == NULL) |
603 | panic("Can't create pid_1 cachep\n"); | 604 | panic("Can't create pid_1 cachep\n"); |
605 | |||
606 | pid_ns_cachep = KMEM_CACHE(pid_namespace, SLAB_PANIC); | ||
604 | } | 607 | } |