lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: ramzswap: Free memory when create_device is failed

Browse Source 
If create_device is failed, it can't free gendisk and request_queue of
preceding devices. It cause memory leak.

This patch fixes it.

Signed-off-by: Minchan Kim <minchan.kim@gmail.com>
Acked-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Minchan Kim
2010-01-11 16:15:53 +09:00
committed by Greg Kroah-Hartman
parent b76a32638d
commit 3bf040c752
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/ramzswap/ramzswap_drv.c
View File

@@ -1292,7 +1292,7 @@ static struct block_device_operations ramzswap_devops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static void create_device(struct ramzswap *rzs, int device_id) static int create_device(struct ramzswap *rzs, int device_id)
{ {
mutex_init(&rzs->lock); mutex_init(&rzs->lock);
INIT_LIST_HEAD(&rzs->backing_swap_extent_list); INIT_LIST_HEAD(&rzs->backing_swap_extent_list);
@@ -1301,7 +1301,7 @@ static void create_device(struct ramzswap *rzs, int device_id)
if (!rzs->queue) { if (!rzs->queue) {
pr_err("Error allocating disk queue for device %d\n", pr_err("Error allocating disk queue for device %d\n",
device_id); device_id);
return; return 0;
} }
blk_queue_make_request(rzs->queue, ramzswap_make_request); blk_queue_make_request(rzs->queue, ramzswap_make_request);
@@ -1313,7 +1313,7 @@ static void create_device(struct ramzswap *rzs, int device_id)
blk_cleanup_queue(rzs->queue); blk_cleanup_queue(rzs->queue);
pr_warning("Error allocating disk structure for device %d\n", pr_warning("Error allocating disk structure for device %d\n",
device_id); device_id);
return; return 0;
} }
rzs->disk->major = ramzswap_major; rzs->disk->major = ramzswap_major;
@@ -1331,6 +1331,7 @@ static void create_device(struct ramzswap *rzs, int device_id)
add_disk(rzs->disk); add_disk(rzs->disk);
rzs->init_done = 0; rzs->init_done = 0;
return 1;
} }
static void destroy_device(struct ramzswap *rzs) static void destroy_device(struct ramzswap *rzs)
@@ -1368,16 +1369,20 @@ static int __init ramzswap_init(void)
/* Allocate the device array and initialize each one */ /* Allocate the device array and initialize each one */
pr_info("Creating %u devices ...\n", num_devices); pr_info("Creating %u devices ...\n", num_devices);
devices = kzalloc(num_devices * sizeof(struct ramzswap), GFP_KERNEL); devices = kzalloc(num_devices * sizeof(struct ramzswap), GFP_KERNEL);
if (!devices) { if (!devices)
ret = -ENOMEM;
goto out; goto out;
}
for (i = 0; i < num_devices; i++) for (i = 0; i < num_devices; i++)
create_device(&devices[i], i); if (!create_device(&devices[i], i)) {
ret = i;
goto free_devices;
}
return 0; return 0;
free_devices:
for (i = 0; i < ret; i++)
destroy_device(&devices[i]);
out: out:
ret = -ENOMEM;
unregister_blkdev(ramzswap_major, "ramzswap"); unregister_blkdev(ramzswap_major, "ramzswap");
return ret; return ret;
} }