Commit 70e8fcb6 authored by Rashika Kheria's avatar Rashika Kheria Committed by Greg Kroah-Hartman

Staging: zram: Fix access of NULL pointer

commit 46a51c80 upstream.

This patch fixes the bug in reset_store caused by accessing NULL pointer.

The bdev gets its value from bdget_disk() which could fail when memory
pressure is severe and hence can return NULL because allocation of
inode in bdget could fail.

Hence, this patch introduces a check for bdev to prevent reference to a
NULL pointer in the later part of the code. It also removes unnecessary
check of bdev for fsync_bdev().
Acked-by: default avatarJerome Marchand <jmarchan@redhat.com>
Signed-off-by: default avatarRashika Kheria <rashika.kheria@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: Jianguo Wu <wujianguo@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f607459
...@@ -95,6 +95,9 @@ static ssize_t reset_store(struct device *dev, ...@@ -95,6 +95,9 @@ static ssize_t reset_store(struct device *dev,
zram = dev_to_zram(dev); zram = dev_to_zram(dev);
bdev = bdget_disk(zram->disk, 0); bdev = bdget_disk(zram->disk, 0);
if (!bdev)
return -ENOMEM;
/* Do not reset an active device! */ /* Do not reset an active device! */
if (bdev->bd_holders) if (bdev->bd_holders)
return -EBUSY; return -EBUSY;
...@@ -107,7 +110,6 @@ static ssize_t reset_store(struct device *dev, ...@@ -107,7 +110,6 @@ static ssize_t reset_store(struct device *dev,
return -EINVAL; return -EINVAL;
/* Make sure all pending I/O is finished */ /* Make sure all pending I/O is finished */
if (bdev)
fsync_bdev(bdev); fsync_bdev(bdev);
down_write(&zram->init_lock); down_write(&zram->init_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment