USB: console: fix potential use after free (32a4bf2e) · Commits · 戴 / test

drivers/usb/serial/console.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ static struct console usbcons;
		* ------------------------------------------------------------
		*/

		static const struct tty_operations usb_console_fake_tty_ops = {
		};

		/*
		* The parsing of the command line works exactly like the
		@@ -137,14 +139,17 @@ static int usb_console_setup(struct console co, char options)
		goto reset_open_count;
		}
		kref_init(&tty->kref);
		tty_port_tty_set(&port->port, tty);
		tty->driver = usb_serial_tty_driver;
		tty->index = co->index;
		init_ldsem(&tty->ldisc_sem);
		INIT_LIST_HEAD(&tty->tty_files);
		kref_get(&tty->driver->kref);
		tty->ops = &usb_console_fake_tty_ops;
		if (tty_init_termios(tty)) {
		retval = -ENOMEM;
		goto free_tty;
		goto put_tty;
		}
		tty_port_tty_set(&port->port, tty);
		}

		/* only call the device specific open if this
		@@ -162,7 +167,7 @@ static int usb_console_setup(struct console co, char options)
		serial->type->set_termios(tty, port, &dummy);

		tty_port_tty_set(&port->port, NULL);
		kfree(tty);
		tty_kref_put(tty);
		}
		set_bit(ASYNCB_INITIALIZED, &port->port.flags);
		}
		@@ -178,8 +183,8 @@ static int usb_console_setup(struct console co, char options)

		fail:
		tty_port_tty_set(&port->port, NULL);
		free_tty:
		kfree(tty);
		put_tty:
		tty_kref_put(tty);
		reset_open_count:
		port->port.count = 0;
		usb_autopm_put_interface(serial->interface);