diff options
| author | Jiang Liu <liuj97@gmail.com> | 2013-06-07 00:07:24 +0800 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:40 +1000 |
| commit | 750c4a7e63dbb0b893680b5ba77add8258a36f56 (patch) | |
| tree | 2208c25f2c3bf2027c4480099f1fa7ad0dc275ca /drivers/staging | |
| parent | fca3f62f4a4b39ef3d019506fd41b86c3eb1b7cb (diff) | |
| download | kernel_samsung_smdk4412-750c4a7e63dbb0b893680b5ba77add8258a36f56.tar.gz kernel_samsung_smdk4412-750c4a7e63dbb0b893680b5ba77add8258a36f56.tar.bz2 kernel_samsung_smdk4412-750c4a7e63dbb0b893680b5ba77add8258a36f56.zip | |
zram: destroy all devices on error recovery path in zram_init()
On error recovery path of zram_init(), it leaks the zram device object
causing the failure. So change create_device() to free allocated
resources on error path.
Change-Id: Ia8508ab9aad3201c6fc12634b8e134d78d7d1423
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 39a9b8ac9333e4268ecff7da6c9d1ab3823ff243
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/zram/zram_drv.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index 14e5430c06f..ad5e907148b 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -597,7 +597,7 @@ static const struct block_device_operations zram_devops = { static int create_device(struct zram *zram, int device_id) { - int ret = 0; + int ret = -ENOMEM; init_rwsem(&zram->lock); init_rwsem(&zram->init_lock); @@ -607,7 +607,6 @@ static int create_device(struct zram *zram, int device_id) if (!zram->queue) { pr_err("Error allocating disk queue for device %d\n", device_id); - ret = -ENOMEM; goto out; } @@ -617,11 +616,9 @@ static int create_device(struct zram *zram, int device_id) /* gendisk structure */ zram->disk = alloc_disk(1); if (!zram->disk) { - blk_cleanup_queue(zram->queue); pr_warn("Error allocating disk structure for device %d\n", device_id); - ret = -ENOMEM; - goto out; + goto out_free_queue; } zram->disk->major = zram_major; @@ -650,11 +647,17 @@ static int create_device(struct zram *zram, int device_id) &zram_disk_attr_group); if (ret < 0) { pr_warn("Error creating sysfs group"); - goto out; + goto out_free_disk; } zram->init_done = 0; + return 0; +out_free_disk: + del_gendisk(zram->disk); + put_disk(zram->disk); +out_free_queue: + blk_cleanup_queue(zram->queue); out: return ret; } |