diff options
| author | Rashika Kheria <rashika.kheria@gmail.com> | 2013-11-10 22:13:53 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-16 13:45:45 -0700 |
| commit | 35a2bae84d5bc0a6609134b51053f78d235940c2 (patch) | |
| tree | 723305c69bbe03e9a917eb659b9a850d13b125f8 | |
| parent | 0e8af2178cb86033d30c2e468b46e42af8af20d9 (diff) | |
| download | lwn-35a2bae84d5bc0a6609134b51053f78d235940c2.tar.gz lwn-35a2bae84d5bc0a6609134b51053f78d235940c2.zip | |
Staging: zram: Fix memory leak by refcount mismatch
commit 1b672224d128ec2570eb37572ff803cfe452b4f7 upstream.
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>
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
[bwh: Backported to 3.2: adjust filename, context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
[wyj: Backported to 3.4: adjust context]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/zram/zram_sysfs.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/staging/zram/zram_sysfs.c b/drivers/staging/zram/zram_sysfs.c index 01f9a79aad43..aafcf0330014 100644 --- a/drivers/staging/zram/zram_sysfs.c +++ b/drivers/staging/zram/zram_sysfs.c @@ -99,18 +99,23 @@ 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); down_write(&zram->init_lock); if (zram->init_done) @@ -118,6 +123,10 @@ static ssize_t reset_store(struct device *dev, up_write(&zram->init_lock); return len; + +out: + bdput(bdev); + return ret; } static ssize_t num_reads_show(struct device *dev, |