[04/98] zram: avoid double free in function zram_bvec_write()

Message ID 1373552708-15235-5-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques July 11, 2013, 2:23 p.m. -stable review patch.  If anyone has any objections, please let me know.


From: Jiang Liu <liuj97@gmail.com>

commit 65c484609a3b25c35e4edcd5f2c38f98f5226093 upstream.

When doing a patial write and the whole page is filled with zero,
zram_bvec_write() will free uncmem twice.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[ luis: backported to 3.5: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
 drivers/staging/zram/zram_drv.c | 2 --
 1 file changed, 2 deletions(-)


diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 7860762..6b1e443 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -361,8 +361,6 @@  static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
 	if (page_zero_filled(uncmem)) {
-		if (is_partial_io(bvec))
-			kfree(uncmem);
 		zram_set_flag(zram, index, ZRAM_ZERO);
 		ret = 0;