[PATCH 3.13.y-ckt 084/121] zram: avoid kunmap_atomic() of a NULL pointer
Kamal Mostafa
kamal at canonical.com
Tue Dec 2 19:19:23 UTC 2014
3.13.11-ckt12 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Weijie Yang <weijie.yang at samsung.com>
commit c406515239376fc93a30d5d03192182160cbd3fb upstream.
zram could kunmap_atomic() a NULL pointer in a rare situation: a zram
page becomes a full-zeroed page after a partial write io. The current
code doesn't handle this case and performs kunmap_atomic() on a NULL
pointer, which panics the kernel.
This patch fixes this issue.
Signed-off-by: Weijie Yang <weijie.yang at samsung.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky at gmail.com>
Cc: Dan Streetman <ddstreet at ieee.org>
Cc: Nitin Gupta <ngupta at vflare.org>
Cc: Weijie Yang <weijie.yang.kh at gmail.com>
Acked-by: Jerome Marchand <jmarchan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
drivers/staging/zram/zram_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index e2f0add..63c2a5b 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -430,7 +430,8 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
}
if (page_zero_filled(uncmem)) {
- kunmap_atomic(user_mem);
+ if (user_mem)
+ kunmap_atomic(user_mem);
/* Free memory associated with this sector now. */
zram_free_page(zram, index);
--
1.9.1
More information about the kernel-team
mailing list