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, 30 Jan 2013 11:41:39 +0900 From: Minchan Kim <minchan@...nel.org> To: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: linux-mm@...ck.org, linux-kernel@...r.kernel.org, Nitin Gupta <ngupta@...are.org>, Seth Jennings <sjenning@...ux.vnet.ibm.com>, Konrad Rzeszutek Wilk <konrad@...nok.org>, Dan Magenheimer <dan.magenheimer@...cle.com>, Pekka Enberg <penberg@...helsinki.fi>, jmarchan@...hat.com, Minchan Kim <minchan@...nel.org>, stable@...r.kernel.org, Pekka Enberg <penberg@...nel.org> Subject: [PATCH v6 1/4] zram: Fix deadlock bug in partial read/write Now zram allocates new page with GFP_KERNEL in zram I/O path if IO is partial. Unfortunately, It may cause deadlock with reclaim path like below. write_page from fs fs_lock allocation(GFP_KERNEL) reclaim pageout write_page from fs fs_lock <-- deadlock This patch fixes it by using GFP_NOIO. In read path, we reorganize code flow so that kmap_atomic is called after the GFP_NOIO allocation. Cc: stable@...r.kernel.org Cc: Jerome Marchand <jmarchan@...hat.com> Acked-by: Nitin Gupta <ngupta@...are.org> [ penberg@...nel.org: don't use GFP_ATOMIC ] Signed-off-by: Pekka Enberg <penberg@...nel.org> Signed-off-by: Minchan Kim <minchan@...nel.org> --- drivers/staging/zram/zram_drv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index 77a3f0d..5ff8749 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -217,11 +217,12 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec, return 0; } - user_mem = kmap_atomic(page); if (is_partial_io(bvec)) /* Use a temporary buffer to decompress the page */ - uncmem = kmalloc(PAGE_SIZE, GFP_KERNEL); - else + uncmem = kmalloc(PAGE_SIZE, GFP_NOIO); + + user_mem = kmap_atomic(page); + if (!is_partial_io(bvec)) uncmem = user_mem; if (!uncmem) { @@ -268,7 +269,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, * This is a partial IO. We need to read the full page * before to write the changes. */ - uncmem = kmalloc(PAGE_SIZE, GFP_KERNEL); + uncmem = kmalloc(PAGE_SIZE, GFP_NOIO); if (!uncmem) { pr_info("Error allocating temp memory!\n"); ret = -ENOMEM; -- 1.7.9.5 -- 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