Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea6f94df authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

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



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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3864c489

drivers/block/rd.c

+6 −6
Original line number Diff line number Diff line
@@ -432,6 +432,12 @@ static int __init rd_init(void) 
		rd_disks[i] = alloc_disk(1);

		if (!rd_disks[i])

			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")) {
@@ -442,10 +448,6 @@ static int __init rd_init(void) 
	for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; 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_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);



	return 0;

out_queue:

	unregister_blkdev(RAMDISK_MAJOR, "ramdisk");

out:

	while (i--) {

		put_disk(rd_disks[i]);