* [PATCH 1/2] zram: fix memory freeing in zram_meta_alloc
@ 2015-11-08 15:32 Geliang Tang
2015-11-08 15:32 ` [PATCH 2/2] zram: fix memory freeing in zram_bvec_read Geliang Tang
2015-11-09 0:33 ` [PATCH 1/2] zram: fix memory freeing in zram_meta_alloc Sergey Senozhatsky
0 siblings, 2 replies; 4+ messages in thread
From: Geliang Tang @ 2015-11-08 15:32 UTC (permalink / raw)
To: Minchan Kim, Nitin Gupta, Sergey Senozhatsky; +Cc: Geliang Tang, linux-kernel
When meta->table is NULL, there is no need to vfree it.
Signed-off-by: Geliang Tang <geliangtang@163.com>
---
drivers/block/zram/zram_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 81a557c..197a7ad 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -511,7 +511,7 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
meta->table = vzalloc(num_pages * sizeof(*meta->table));
if (!meta->table) {
pr_err("Error allocating zram address table\n");
- goto out_error;
+ goto out_free;
}
meta->mem_pool = zs_create_pool(pool_name, GFP_NOIO | __GFP_HIGHMEM);
@@ -524,6 +524,7 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
out_error:
vfree(meta->table);
+out_free:
kfree(meta);
return NULL;
}
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] zram: fix memory freeing in zram_bvec_read
2015-11-08 15:32 [PATCH 1/2] zram: fix memory freeing in zram_meta_alloc Geliang Tang
@ 2015-11-08 15:32 ` Geliang Tang
2015-11-09 0:42 ` Sergey Senozhatsky
2015-11-09 0:33 ` [PATCH 1/2] zram: fix memory freeing in zram_meta_alloc Sergey Senozhatsky
1 sibling, 1 reply; 4+ messages in thread
From: Geliang Tang @ 2015-11-08 15:32 UTC (permalink / raw)
To: Minchan Kim, Nitin Gupta, Sergey Senozhatsky; +Cc: Geliang Tang, linux-kernel
When user_mem is NULL, there is no need to kunmap_atomic it.
Signed-off-by: Geliang Tang <geliangtang@163.com>
---
drivers/block/zram/zram_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 197a7ad..da7b348 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -625,7 +625,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
if (!uncmem) {
pr_err("Unable to allocate temp memory\n");
ret = -ENOMEM;
- goto out_cleanup;
+ goto out_free;
}
ret = zram_decompress_page(zram, uncmem, index);
@@ -641,6 +641,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
ret = 0;
out_cleanup:
kunmap_atomic(user_mem);
+out_free:
if (is_partial_io(bvec))
kfree(uncmem);
return ret;
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] zram: fix memory freeing in zram_meta_alloc
2015-11-08 15:32 [PATCH 1/2] zram: fix memory freeing in zram_meta_alloc Geliang Tang
2015-11-08 15:32 ` [PATCH 2/2] zram: fix memory freeing in zram_bvec_read Geliang Tang
@ 2015-11-09 0:33 ` Sergey Senozhatsky
1 sibling, 0 replies; 4+ messages in thread
From: Sergey Senozhatsky @ 2015-11-09 0:33 UTC (permalink / raw)
To: Geliang Tang; +Cc: Minchan Kim, Andrew Morton, Sergey Senozhatsky, linux-kernel
On (11/08/15 23:32), Geliang Tang wrote:
> When meta->table is NULL, there is no need to vfree it.
>
Hi,
So what's the benefit? It's ok to pass a NULL pointer to vfree(). Why
would we add another label? To avoid a valid call on error path?
-ss
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
> drivers/block/zram/zram_drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> index 81a557c..197a7ad 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -511,7 +511,7 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
> meta->table = vzalloc(num_pages * sizeof(*meta->table));
> if (!meta->table) {
> pr_err("Error allocating zram address table\n");
> - goto out_error;
> + goto out_free;
> }
>
> meta->mem_pool = zs_create_pool(pool_name, GFP_NOIO | __GFP_HIGHMEM);
> @@ -524,6 +524,7 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
>
> out_error:
> vfree(meta->table);
> +out_free:
> kfree(meta);
> return NULL;
> }
> --
> 2.5.0
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] zram: fix memory freeing in zram_bvec_read
2015-11-08 15:32 ` [PATCH 2/2] zram: fix memory freeing in zram_bvec_read Geliang Tang
@ 2015-11-09 0:42 ` Sergey Senozhatsky
0 siblings, 0 replies; 4+ messages in thread
From: Sergey Senozhatsky @ 2015-11-09 0:42 UTC (permalink / raw)
To: Geliang Tang; +Cc: Minchan Kim, Andrew Morton, Sergey Senozhatsky, linux-kernel
On (11/08/15 23:32), Geliang Tang wrote:
> When user_mem is NULL, there is no need to kunmap_atomic it.
Hi,
kunmap_atomic() should be called.
-ss
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
> drivers/block/zram/zram_drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> index 197a7ad..da7b348 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -625,7 +625,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
> if (!uncmem) {
> pr_err("Unable to allocate temp memory\n");
> ret = -ENOMEM;
> - goto out_cleanup;
> + goto out_free;
> }
>
> ret = zram_decompress_page(zram, uncmem, index);
> @@ -641,6 +641,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
> ret = 0;
> out_cleanup:
> kunmap_atomic(user_mem);
> +out_free:
> if (is_partial_io(bvec))
> kfree(uncmem);
> return ret;
> --
> 2.5.0
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-09 0:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-08 15:32 [PATCH 1/2] zram: fix memory freeing in zram_meta_alloc Geliang Tang
2015-11-08 15:32 ` [PATCH 2/2] zram: fix memory freeing in zram_bvec_read Geliang Tang
2015-11-09 0:42 ` Sergey Senozhatsky
2015-11-09 0:33 ` [PATCH 1/2] zram: fix memory freeing in zram_meta_alloc Sergey Senozhatsky
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.