lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 9 Nov 2015 09:42:36 +0900 From: Sergey Senozhatsky <sergey.senozhatsky.work@...il.com> To: Geliang Tang <geliangtang@....com> Cc: Minchan Kim <minchan@...nel.org>, Andrew Morton <akpm@...ux-foundation.org>, Sergey Senozhatsky <sergey.senozhatsky.work@...il.com>, linux-kernel@...r.kernel.org Subject: Re: [PATCH 2/2] zram: fix memory freeing in zram_bvec_read 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@....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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists