evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hso: fix NULL-deref on tty open

Browse source 
[ Upstream commit 8353da9fa69722b54cba82b2ec740afd3d438748 ]

Fix NULL-pointer dereference on tty open due to a failure to handle a
missing interrupt-in endpoint when probing modem ports:

	BUG: kernel NULL pointer dereference, address: 0000000000000006
	...
	RIP: 0010:tiocmget_submit_urb+0x1c/0xe0 [hso]
	...
	Call Trace:
	hso_start_serial_device+0xdc/0x140 [hso]
	hso_serial_open+0x118/0x1b0 [hso]
	tty_open+0xf1/0x490

Fixes: 542f548236 ("tty: Modem functions for the HSO driver")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2019-09-30 17:12:41 +02:00 • committed by Greg Kroah-Hartman
parent fcf46dcedb
commit 8e3dadbf40
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/usb/hso.c
View file

@ -2650,14 +2650,18 @@ static struct hso_device *hso_create_bulk_serial_device(
*/ */
if (serial->tiocmget) { if (serial->tiocmget) {
tiocmget = serial->tiocmget; tiocmget = serial->tiocmget;
tiocmget->endp = hso_get_ep(interface,
USB_ENDPOINT_XFER_INT,
USB_DIR_IN);
if (!tiocmget->endp) {
dev_err(&interface->dev, "Failed to find INT IN ep\n");
goto exit;
}
tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL); tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL);
if (tiocmget->urb) { if (tiocmget->urb) {
mutex_init(&tiocmget->mutex); mutex_init(&tiocmget->mutex);
init_waitqueue_head(&tiocmget->waitq); init_waitqueue_head(&tiocmget->waitq);
tiocmget->endp = hso_get_ep(
interface,
USB_ENDPOINT_XFER_INT,
USB_DIR_IN);
} else } else
hso_free_tiomget(serial); hso_free_tiomget(serial);
} }