2013-10-30 13:13:43

by Rashika Kheria

Subject: [PATCH v8 3/3] Staging: zram: Fix variable dereferenced before check

This patch fixes the following Smatch warning in zram_drv.c-
drivers/staging/zram/zram_drv.c:899
destroy_device() warn: variable dereferenced before check 'zram->disk' (see line 896)

Acked-by: Minchan Kim <[email protected]>
Acked-by: Jerome Marchand <[email protected]>
Signed-off-by: Rashika Kheria <[email protected]>
---

This revision fixes the following issues of the previous revision-
Removes Cc to [email protected] as it is just a Smatch warning fix

drivers/staging/zram/zram_drv.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 0bc2835..cfa1d2e 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -909,13 +909,10 @@ static void destroy_device(struct zram *zram)
sysfs_remove_group(&disk_to_dev(zram->disk)->kobj,
&zram_disk_attr_group);

- if (zram->disk) {
- del_gendisk(zram->disk);
- put_disk(zram->disk);
- }
+ del_gendisk(zram->disk);
+ put_disk(zram->disk);

- if (zram->queue)
- blk_cleanup_queue(zram->queue);
+ blk_cleanup_queue(zram->queue);
}

static int __init zram_init(void)
--
1.7.9.5

2013-10-30 16:36:21

by Greg Kroah-Hartman

Subject: Re: [PATCH v8 3/3] Staging: zram: Fix variable dereferenced before check

On Wed, Oct 30, 2013 at 06:43:32PM +0530, Rashika Kheria wrote:
> This patch fixes the following Smatch warning in zram_drv.c-
> drivers/staging/zram/zram_drv.c:899
> destroy_device() warn: variable dereferenced before check 'zram->disk' (see line 896)
>
> Acked-by: Minchan Kim <[email protected]>
> Acked-by: Jerome Marchand <[email protected]>
> Signed-off-by: Rashika Kheria <[email protected]>
> ---
>
> This revision fixes the following issues of the previous revision-
> Removes Cc to [email protected] as it is just a Smatch warning fix

Applied, thanks.

greg k-h