Commit 1ec6995d authored by Xidong Wang's avatar Xidong Wang Committed by Linus Torvalds

z3fold: fix memory leak

In z3fold_create_pool(), the memory allocated by __alloc_percpu() is not
released on the error path that pool->compact_wq , which holds the
return value of create_singlethread_workqueue(), is NULL.  This will
result in a memory leak bug.

[akpm@linux-foundation.org: fix oops on kzalloc() failure, check __alloc_percpu() retval]
Link: http://lkml.kernel.org/r/1522803111-29209-1-git-send-email-wangxidong_97@163.comSigned-off-by: default avatarXidong Wang <wangxidong_97@163.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Vitaly Wool <vitalywool@gmail.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a70f6a7
...@@ -467,6 +467,8 @@ static struct z3fold_pool *z3fold_create_pool(const char *name, gfp_t gfp, ...@@ -467,6 +467,8 @@ static struct z3fold_pool *z3fold_create_pool(const char *name, gfp_t gfp,
spin_lock_init(&pool->lock); spin_lock_init(&pool->lock);
spin_lock_init(&pool->stale_lock); spin_lock_init(&pool->stale_lock);
pool->unbuddied = __alloc_percpu(sizeof(struct list_head)*NCHUNKS, 2); pool->unbuddied = __alloc_percpu(sizeof(struct list_head)*NCHUNKS, 2);
if (!pool->unbuddied)
goto out_pool;
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
struct list_head *unbuddied = struct list_head *unbuddied =
per_cpu_ptr(pool->unbuddied, cpu); per_cpu_ptr(pool->unbuddied, cpu);
...@@ -479,7 +481,7 @@ static struct z3fold_pool *z3fold_create_pool(const char *name, gfp_t gfp, ...@@ -479,7 +481,7 @@ static struct z3fold_pool *z3fold_create_pool(const char *name, gfp_t gfp,
pool->name = name; pool->name = name;
pool->compact_wq = create_singlethread_workqueue(pool->name); pool->compact_wq = create_singlethread_workqueue(pool->name);
if (!pool->compact_wq) if (!pool->compact_wq)
goto out; goto out_unbuddied;
pool->release_wq = create_singlethread_workqueue(pool->name); pool->release_wq = create_singlethread_workqueue(pool->name);
if (!pool->release_wq) if (!pool->release_wq)
goto out_wq; goto out_wq;
...@@ -489,8 +491,11 @@ static struct z3fold_pool *z3fold_create_pool(const char *name, gfp_t gfp, ...@@ -489,8 +491,11 @@ static struct z3fold_pool *z3fold_create_pool(const char *name, gfp_t gfp,
out_wq: out_wq:
destroy_workqueue(pool->compact_wq); destroy_workqueue(pool->compact_wq);
out: out_unbuddied:
free_percpu(pool->unbuddied);
out_pool:
kfree(pool); kfree(pool);
out:
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment