GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 23:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] rd: memory leak on rd_init() failure

Browse source 
If RAM disk driver initialization fails due to blk_alloc_queue() faulure, the
gendisk structs stored in rd_disks[] will not be freed completely.

This patch resolves that memory leak case by doing alloc_disk() and
blk_alloc_queue() at the same time.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Akinobu Mita 2006-10-17 00:10:27 -07:00 • committed by Linus Torvalds
parent 3864c4894a
commit ea6f94dfe9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/block/rd.c
View file

@ -432,6 +432,12 @@ static int __init rd_init(void)
rd_disks[i] = alloc_disk(1); rd_disks[i] = alloc_disk(1);
if (!rd_disks[i]) if (!rd_disks[i])
goto out; goto out;
rd_queue[i] = blk_alloc_queue(GFP_KERNEL);
if (!rd_queue[i]) {
put_disk(rd_disks[i]);
goto out;
}
} }
if (register_blkdev(RAMDISK_MAJOR, "ramdisk")) { if (register_blkdev(RAMDISK_MAJOR, "ramdisk")) {
@ -442,10 +448,6 @@ static int __init rd_init(void)
for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) { for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) {
struct gendisk *disk = rd_disks[i]; struct gendisk *disk = rd_disks[i];
rd_queue[i] = blk_alloc_queue(GFP_KERNEL);
if (!rd_queue[i])
goto out_queue;
blk_queue_make_request(rd_queue[i], &rd_make_request); blk_queue_make_request(rd_queue[i], &rd_make_request);
blk_queue_hardsect_size(rd_queue[i], rd_blocksize); blk_queue_hardsect_size(rd_queue[i], rd_blocksize);
@ -466,8 +468,6 @@ static int __init rd_init(void)
CONFIG_BLK_DEV_RAM_COUNT, rd_size, rd_blocksize); CONFIG_BLK_DEV_RAM_COUNT, rd_size, rd_blocksize);
return 0; return 0;
out_queue:
unregister_blkdev(RAMDISK_MAJOR, "ramdisk");
out: out:
while (i--) { while (i--) {
put_disk(rd_disks[i]); put_disk(rd_disks[i]);