From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752109AbbKIAmI (ORCPT ); Sun, 8 Nov 2015 19:42:08 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:35374 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751901AbbKIAlk (ORCPT ); Sun, 8 Nov 2015 19:41:40 -0500 Date: Mon, 9 Nov 2015 09:42:36 +0900 From: Sergey Senozhatsky To: Geliang Tang Cc: Minchan Kim , Andrew Morton , Sergey Senozhatsky , linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] zram: fix memory freeing in zram_bvec_read Message-ID: <20151109004236.GB471@swordfish> References: <325e5c0cbcc756b88dfc78b6d9388c07be7aa8f1.1446996521.git.geliangtang@163.com> <71cc3c69c9d50cf63a808285f524c8b5210ffaf2.1446996521.git.geliangtang@163.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <71cc3c69c9d50cf63a808285f524c8b5210ffaf2.1446996521.git.geliangtang@163.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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