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

Commit eba0e3c3 authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

USB: serial: fix hang when opening port 

Johan's 'fix use-after-free in TIOCMIWAIT' patchset[1] introduces
one bug which can cause kernel hang when opening port.

This patch initialized the 'port->delta_msr_wait' waitqueue head
to fix the bug which is introduced in 3.9-rc4.

[1], http://marc.info/?l=linux-usb&m=136368139627876&w=2



Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Acked-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85ecd032

drivers/usb/serial/usb-serial.c

+1 −0
Original line number Diff line number Diff line
@@ -903,6 +903,7 @@ static int usb_serial_probe(struct usb_interface *interface, 
		port->port.ops = &serial_port_ops;

		port->serial = serial;

		spin_lock_init(&port->lock);

		init_waitqueue_head(&port->delta_msr_wait);

		/* Keep this for private driver use for the moment but

		   should probably go away */

		INIT_WORK(&port->work, usb_serial_port_work);