Skip to content

Commit

Permalink
Staging: zram: Fix access of NULL pointer
Browse files Browse the repository at this point in the history
commit 46a51c8 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: Jerome Marchand <jmarchan@redhat.com>
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Rashika Kheria authored and Greg Kroah-Hartman committed Nov 29, 2013
1 parent f30d41a commit a552be3
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/staging/zram/zram_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,9 @@ static ssize_t reset_store(struct device *dev,
zram = dev_to_zram(dev);
bdev = bdget_disk(zram->disk, 0);

if (!bdev)
return -ENOMEM;

/* Do not reset an active device! */
if (bdev->bd_holders)
return -EBUSY;
Expand All @@ -659,8 +662,7 @@ static ssize_t reset_store(struct device *dev,
return -EINVAL;

/* Make sure all pending I/O is finished */
if (bdev)
fsync_bdev(bdev);
fsync_bdev(bdev);

zram_reset_device(zram, true);
return len;
Expand Down

0 comments on commit a552be3

Please sign in to comment.