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

Commit 4384a3fa authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: rocket, remove potential leak in module_init 



if (controller && !request_region) then we leaked a tty driver struct, fix it
by adding function deinit tail with goto-ing into it (and from other fail
paths too)

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 57fedc7a

drivers/char/rocket.c

+20 −14
Original line number Diff line number Diff line
@@ -2359,14 +2359,14 @@ static const struct tty_operations rocket_ops = { 
 */

static int __init rp_init(void)

{

	int retval, pci_boards_found, isa_boards_found, i;

	int ret = -ENOMEM, pci_boards_found, isa_boards_found, i;



	printk(KERN_INFO "RocketPort device driver module, version %s, %s\n",

	       ROCKET_VERSION, ROCKET_DATE);



	rocket_driver = alloc_tty_driver(MAX_RP_PORTS);

	if (!rocket_driver)

		return -ENOMEM;

		goto err;



	/*

	 *  If board 1 is non-zero, there is at least one ISA configured.  If controller is
@@ -2381,8 +2381,11 @@ static int __init rp_init(void) 


	/*  If an ISA card is configured, reserve the 4 byte IO space for the Mudbac controller */

	if (controller && (!request_region(controller, 4, "Comtrol RocketPort"))) {

		printk(KERN_INFO "Unable to reserve IO region for first configured ISA RocketPort controller 0x%lx.  Driver exiting \n", controller);

		return -EBUSY;

		printk(KERN_ERR "Unable to reserve IO region for first "

			"configured ISA RocketPort controller 0x%lx.  "

			"Driver exiting\n", controller);

		ret = -EBUSY;

		goto err_tty;

	}



	/*  Store ISA variable retrieved from command line or .conf file. */
@@ -2423,11 +2426,10 @@ static int __init rp_init(void) 
#endif

	tty_set_operations(rocket_driver, &rocket_ops);



	retval = tty_register_driver(rocket_driver);

	if (retval < 0) {

		printk(KERN_INFO "Couldn't install tty RocketPort driver (error %d)\n", -retval);

		put_tty_driver(rocket_driver);

		return -1;

	ret = tty_register_driver(rocket_driver);

	if (ret < 0) {

		printk(KERN_ERR "Couldn't install tty RocketPort driver\n");

		goto err_tty;

	}



#ifdef ROCKET_DEBUG_OPEN
@@ -2454,14 +2456,18 @@ static int __init rp_init(void) 
	max_board = pci_boards_found + isa_boards_found;



	if (max_board == 0) {

		printk(KERN_INFO "No rocketport ports found; unloading driver.\n");

		del_timer_sync(&rocket_timer);

		tty_unregister_driver(rocket_driver);

		put_tty_driver(rocket_driver);

		return -ENXIO;

		printk(KERN_ERR "No rocketport ports found; unloading driver\n");

		ret = -ENXIO;

		goto err_ttyu;

	}



	return 0;

err_ttyu:

	tty_unregister_driver(rocket_driver);

err_tty:

	put_tty_driver(rocket_driver);

err:

	return ret;

}