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, 4 Feb 2015 10:07:20 +0900 From: Sergey Senozhatsky <sergey.senozhatsky.work@...il.com> To: linux-kernel@...r.kernel.org Cc: akpm@...ux-foundation.org, jmarchan@...hat.com, minchan@...nel.org, ngupta@...are.org, opensource.ganesh@...il.com, sergey.senozhatsky@...il.com, mm-commits@...r.kernel.org Subject: Re: + zram-rework-reset-and-destroy-path-fix.patch added to -mm tree On (02/03/15 15:11), akpm@...ux-foundation.org wrote: > tweak comment > Thank you, sir. Andrew, can you please squash the following patch? --- >From 22f0be96df55513a3d764ea880d5b3e99669f8f7 Mon Sep 17 00:00:00 2001 From: Sergey Senozhatsky <sergey.senozhatsky@...il.com> Date: Wed, 4 Feb 2015 09:59:06 +0900 Subject: [PATCH] zram: set default dev_id value to zero in zram_init() Set dev_id to zero and fix zram_devices allocation error handling path, can pass uninit dev_id to destroy_devices(). cosmetic: change destroy_devices() message from pr_debug() to pr_info(), as proposed by Minchan Kim. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@...il.com> --- drivers/block/zram/zram_drv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 79c5da9..0bb4fa0 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1138,12 +1138,12 @@ static void destroy_devices(unsigned int nr) kfree(zram_devices); unregister_blkdev(zram_major, "zram"); - pr_debug("Destroyed %u device(s)\n", nr); + pr_info("Destroyed %u device(s)\n", nr); } static int __init zram_init(void) { - int ret, dev_id; + int ret = -ENOMEM, dev_id = 0; if (num_devices > max_num_devices) { pr_warn("Invalid value for num_devices: %u\n", @@ -1159,10 +1159,8 @@ static int __init zram_init(void) /* Allocate the device array and initialize each one */ zram_devices = kzalloc(num_devices * sizeof(struct zram), GFP_KERNEL); - if (!zram_devices) { - ret = -ENOMEM; + if (!zram_devices) goto out_error; - } for (dev_id = 0; dev_id < num_devices; dev_id++) { ret = create_device(&zram_devices[dev_id], dev_id); -- 2.3.0.rc2 -- 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