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: Wed, 3 Dec 2014 12:25:40 +0100 From: Jiri Slaby <jslaby@...e.cz> To: stable@...r.kernel.org Cc: linux-kernel@...r.kernel.org, Weijie Yang <weijie.yang@...sung.com>, Sergey Senozhatsky <sergey.senozhatsky@...il.com>, Dan Streetman <ddstreet@...e.org>, Nitin Gupta <ngupta@...are.org>, Weijie Yang <weijie.yang.kh@...il.com>, Andrew Morton <akpm@...ux-foundation.org>, Linus Torvalds <torvalds@...ux-foundation.org>, Jiri Slaby <jslaby@...e.cz> Subject: [PATCH 3.12 018/101] zram: avoid kunmap_atomic() of a NULL pointer From: Weijie Yang <weijie.yang@...sung.com> 3.12-stable review patch. If anyone has any objections, please let me know. =============== 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@...sung.com> Cc: Sergey Senozhatsky <sergey.senozhatsky@...il.com> Cc: Dan Streetman <ddstreet@...e.org> Cc: Nitin Gupta <ngupta@...are.org> Cc: Weijie Yang <weijie.yang.kh@...il.com> Acked-by: Jerome Marchand <jmarchan@...hat.com> Signed-off-by: Andrew Morton <akpm@...ux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org> Signed-off-by: Jiri Slaby <jslaby@...e.cz> --- 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 d02088f7dc33..162e01a27d40 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); -- 2.1.3 -- 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