This is a note to let you know that I've just added the patch titled
USB: serial: mos7720: fix parport use-after-free on probe errors
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-serial-mos7720-fix-parport-use-after-free-on-probe-errors.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 75dd211e773afcbc264677b0749d1cf7d937ab2d Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@xxxxxxxxxx>
Date: Tue, 3 Jan 2017 16:39:52 +0100
Subject: USB: serial: mos7720: fix parport use-after-free on probe errors
From: Johan Hovold <johan@xxxxxxxxxx>
commit 75dd211e773afcbc264677b0749d1cf7d937ab2d upstream.
Do not submit the interrupt URB until after the parport has been
successfully registered to avoid another use-after-free in the
completion handler when accessing the freed parport private data in case
of a racing completion.
Fixes: b69578df7e98 ("USB: usbserial: mos7720: add support for parallel port on moschip 7715")
Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/serial/mos7720.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1955,22 +1955,20 @@ static int mos7720_startup(struct usb_se
usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
(__u8)0x03, 0x00, 0x01, 0x00, NULL, 0x00, 5000);
- /* start the interrupt urb */
- ret_val = usb_submit_urb(serial->port[0]->interrupt_in_urb, GFP_KERNEL);
- if (ret_val)
- dev_err(&dev->dev,
- "%s - Error %d submitting control urb\n",
- __func__, ret_val);
-
#ifdef CONFIG_USB_SERIAL_MOS7715_PARPORT
if (product == MOSCHIP_DEVICE_ID_7715) {
ret_val = mos7715_parport_init(serial);
- if (ret_val < 0) {
- usb_kill_urb(serial->port[0]->interrupt_in_urb);
+ if (ret_val < 0)
return ret_val;
- }
}
#endif
+ /* start the interrupt urb */
+ ret_val = usb_submit_urb(serial->port[0]->interrupt_in_urb, GFP_KERNEL);
+ if (ret_val) {
+ dev_err(&dev->dev, "failed to submit interrupt urb: %d\n",
+ ret_val);
+ }
+
/* LSR For Port 1 */
read_mos_reg(serial, 0, MOS7720_LSR, &data);
dev_dbg(&dev->dev, "LSR:%x\n", data);
Patches currently in stable-queue which might be from johan@xxxxxxxxxx are
queue-4.9/usb-serial-io_ti-fix-i-o-after-disconnect.patch
queue-4.9/usb-serial-ti_usb_3410_5052-fix-null-deref-at-open.patch
queue-4.9/usb-serial-kobil_sct-fix-null-deref-in-write.patch
queue-4.9/usb-serial-spcp8x5-fix-null-deref-at-open.patch
queue-4.9/usb-serial-mos7720-fix-parallel-probe.patch
queue-4.9/usb-serial-cyberjack-fix-null-deref-at-open.patch
queue-4.9/usb-serial-mos7720-fix-null-deref-at-open.patch
queue-4.9/usb-serial-garmin_gps-fix-memory-leak-on-failed-urb-submit.patch
queue-4.9/usb-serial-io_ti-fix-null-deref-at-open.patch
queue-4.9/usb-serial-pl2303-fix-null-deref-at-open.patch
queue-4.9/usb-serial-quatech2-fix-sleep-while-atomic-in-close.patch
queue-4.9/usb-serial-iuu_phoenix-fix-null-deref-at-open.patch
queue-4.9/usb-serial-oti6858-fix-null-deref-at-open.patch
queue-4.9/usb-serial-io_edgeport-fix-null-deref-at-open.patch
queue-4.9/usb-serial-mos7720-fix-parport-use-after-free-on-probe-errors.patch
queue-4.9/usb-serial-mos7720-fix-use-after-free-on-probe-errors.patch
queue-4.9/usb-serial-mos7840-fix-null-deref-at-open.patch
queue-4.9/usb-serial-omninet-fix-null-derefs-at-open-and-disconnect.patch
queue-4.9/usb-serial-keyspan_pda-verify-endpoints-at-probe.patch
queue-4.9/usb-serial-io_ti-fix-another-null-deref-at-open.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html