Skip to content

Commit

Permalink
Staging: zram: Fix memory leak by refcount mismatch
Browse files Browse the repository at this point in the history
As suggested by Minchan Kim and Jerome Marchand "The code in reset_store
get the block device (bdget_disk()) but it does not put it (bdput()) when
it's done using it. The usage count is therefore incremented but never
decremented."

This patch also puts bdput() for all error cases.

Acked-by: Minchan Kim <minchan@kernel.org>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Rashika Kheria authored and Greg Kroah-Hartman committed Nov 25, 2013
1 parent 9df6829 commit 1b67222
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions drivers/staging/zram/zram_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -652,21 +652,30 @@ static ssize_t reset_store(struct device *dev,
return -ENOMEM;

/* Do not reset an active device! */
if (bdev->bd_holders)
return -EBUSY;
if (bdev->bd_holders) {
ret = -EBUSY;
goto out;
}

ret = kstrtou16(buf, 10, &do_reset);
if (ret)
return ret;
goto out;

if (!do_reset)
return -EINVAL;
if (!do_reset) {
ret = -EINVAL;
goto out;
}

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

zram_reset_device(zram, true);
return len;

out:
bdput(bdev);
return ret;
}

static void __zram_make_request(struct zram *zram, struct bio *bio, int rw)
Expand Down

0 comments on commit 1b67222

Please sign in to comment.