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

Commit a9dccddb authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: plug in deinitialize_tty_struct 



Used the newly introduced deinitialize_tty_struct to properly shut
down ldisc.

It is intended to fix the Julian's reported problem. He reports that
kmemleak checker warns about memory leak:
unreferenced object 0xc0e19860 (size 8):
comm cat, pid 1226, jiffies 4294919464 (age 287.476s)
hex dump (first 8 bytes):
44 de 2d c1 01 00 00 00 D.-.....
backtrace:
[<c1065a74>] create_object+0x109/0x1ad
[<c1063d2b>] kmem_cache_alloc+0x60/0x68
[<c113505c>] tty_ldisc_get+0x54/0x76
[<c11358c9>] tty_ldisc_init+0xa/0x20
[<c1130ab4>] initialize_tty_struct+0x2d/0x1ac
[<c1130c8c>] tty_init_dev+0x59/0x10d
[<c113136d>] tty_open+0x24a/0x3a2
...

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Reported-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6716671d

drivers/tty/pty.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -304,7 +304,7 @@ static int pty_install(struct tty_driver *driver, struct tty_struct *tty) 
	   the easy way .. */

	   the easy way .. */

	retval = tty_init_termios(tty);

	retval = tty_init_termios(tty);

	if (retval)

	if (retval)

		goto err_module_put;

		goto err_deinit_tty;





	retval = tty_init_termios(o_tty);

	retval = tty_init_termios(o_tty);

	if (retval)

	if (retval)
@@ -327,7 +327,8 @@ static int pty_install(struct tty_driver *driver, struct tty_struct *tty) 
	return 0;

	return 0;

err_free_termios:

err_free_termios:

	tty_free_termios(tty);

	tty_free_termios(tty);

err_module_put:

err_deinit_tty:

	deinitialize_tty_struct(o_tty);

	module_put(o_tty->driver->owner);

	module_put(o_tty->driver->owner);

err_free_tty:

err_free_tty:

	free_tty_struct(o_tty);

	free_tty_struct(o_tty);
@@ -592,6 +593,7 @@ static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty) 
	pty_count++;

	pty_count++;

	return 0;

	return 0;

err_free_mem:

err_free_mem:

	deinitialize_tty_struct(o_tty);

	kfree(o_tty->termios);

	kfree(o_tty->termios);

	kfree(tty->termios);

	kfree(tty->termios);

	module_put(o_tty->driver->owner);

	module_put(o_tty->driver->owner);

drivers/tty/tty_io.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1399,7 +1399,7 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx, 




	retval = tty_driver_install_tty(driver, tty);

	retval = tty_driver_install_tty(driver, tty);

	if (retval < 0)

	if (retval < 0)

		goto err_free_tty;

		goto err_deinit_tty;





	/*

	/*

	 * Structures all installed ... call the ldisc open routines.

	 * Structures all installed ... call the ldisc open routines.
@@ -1411,7 +1411,8 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx, 
		goto err_release_tty;

		goto err_release_tty;

	return tty;

	return tty;





err_free_tty:

err_deinit_tty:

	deinitialize_tty_struct(tty);

	free_tty_struct(tty);

	free_tty_struct(tty);

err_module_put:

err_module_put:

	module_put(driver->owner);

	module_put(driver->owner);