FAILED: patch "[PATCH] USB: serial: keyspan: handle unbound ports" failed to apply to 4.9-stable tree

PATCH [email protected] 3 participants 6 messages Jan 19, 2020 – Jan 20, 2020

Subsystems (3)

Stable branch USB USB serial

lore

Share & tools

lore

[email protected]

author maintainer

2020-01-19 13:41 UTC #0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 3018dd3fa114b13261e9599ddb5656ef97a1fa17 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 17 Jan 2020 10:50:25 +0100
Subject: [PATCH] USB: serial: keyspan: handle unbound ports

Check for NULL port data in the control URB completion handlers to avoid dereferencing a NULL pointer in the unlikely case where a port device isn't bound to a driver (e.g. after an allocation failure on port probe()).

Fixes 0ca1268e109a ("USB Serial Keyspan: add support for USA-49WG & USA-28XG")

Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")

Cc stable <[email protected]>

Reviewed-by Greg Kroah-Hartman <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

drivers/usb/serial/keyspan.c +4 -0

index e66a59ef43a1..aa3dbce22cfb 100644
@@ -1058,6 +1058,8 @@ static void	usa49_glocont_callback(struct urb *urb)
 	for (i = 0; i < serial->num_ports; ++i) {
 		port = serial->port[i];
 		p_priv = usb_get_serial_port_data(port);
+		if (!p_priv)
+			continue;
 
 		if (p_priv->resend_cont) {
 			dev_dbg(&port->dev, "%s - sending setup\n", __func__);

@@ -1459,6 +1461,8 @@ static void usa67_glocont_callback(struct urb *urb)
 	for (i = 0; i < serial->num_ports; ++i) {
 		port = serial->port[i];
 		p_priv = usb_get_serial_port_data(port);
+		if (!p_priv)
+			continue;
 
 		if (p_priv->resend_cont) {
 			dev_dbg(&port->dev, "%s - sending setup\n", __func__);

Sasha Levin

maintainer

2020-01-19 15:47 UTC #1 lore raw

Quoted 22 lines · On Sun, Jan 19, 2020 at 02:41:16PM +0100, [email protected] wrote:

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3018dd3fa114b13261e9599ddb5656ef97a1fa17 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 17 Jan 2020 10:50:25 +0100
Subject: [PATCH] USB: serial: keyspan: handle unbound ports
Check for NULL port data in the control URB completion handlers to avoid dereferencing a NULL pointer in the unlikely case where a port device isn't bound to a driver (e.g. after an allocation failure on port probe()).

Quoted 5 lines

Fixes 0ca1268e109a ("USB Serial Keyspan: add support for USA-49WG & USA-28XG")
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc stable <[email protected]>
Reviewed-by Greg Kroah-Hartman <[email protected]>
Signed-off-by Johan Hovold <[email protected]>

Grabbing the prerequisite for the other USB patch also resolved the conflict here, now queued for 4.9 and 4.4.

Signature · 2 lines

Thanks,
Sasha

Greg KH

author maintainer

2020-01-19 15:51 UTC #2 lore raw

Quoted 23 lines · Sasha Levin

Quoted 22 lines · On Sun, Jan 19, 2020 at 02:41:16PM +0100, [email protected] wrote:
The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 3018dd3fa114b13261e9599ddb5656ef97a1fa17 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 17 Jan 2020 10:50:25 +0100
Subject: [PATCH] USB: serial: keyspan: handle unbound ports
Check for NULL port data in the control URB completion handlers to avoid dereferencing a NULL pointer in the unlikely case where a port device isn't bound to a driver (e.g. after an allocation failure on port probe()).

Quoted 8 lines

Quoted 5 lines
Fixes 0ca1268e109a ("USB Serial Keyspan: add support for USA-49WG & USA-28XG")
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc stable <[email protected]>
Reviewed-by Greg Kroah-Hartman <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
Grabbing the prerequisite for the other USB patch also resolved the conflict here, now queued for 4.9 and 4.4.

Thanks for this and the other fixups you're doing here, much appreciated.

greg k-h

Johan Hovold

maintainer

2020-01-19 16:01 UTC #3 lore raw

In reply to Sasha Levin

Quoted 23 lines · Sasha Levin

Quoted 22 lines · On Sun, Jan 19, 2020 at 02:41:16PM +0100, [email protected] wrote:
The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3018dd3fa114b13261e9599ddb5656ef97a1fa17 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 17 Jan 2020 10:50:25 +0100
Subject: [PATCH] USB: serial: keyspan: handle unbound ports
Check for NULL port data in the control URB completion handlers to avoid dereferencing a NULL pointer in the unlikely case where a port device isn't bound to a driver (e.g. after an allocation failure on port probe()).

Quoted 8 lines

Quoted 5 lines
Fixes 0ca1268e109a ("USB Serial Keyspan: add support for USA-49WG & USA-28XG")
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc stable <[email protected]>
Reviewed-by Greg Kroah-Hartman <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
Grabbing the prerequisite for the other USB patch also resolved the conflict here, now queued for 4.9 and 4.4.

Just curious; which prerequisite are referring to here? I can't seem to understand why this one failed to apply to 4.9 in the first place as there hasn't really been any changes to that code in the keyspan driver.

Johan

Sasha Levin

maintainer

2020-01-19 18:53 UTC #4 lore raw

Quoted 30 lines · Johan Hovold

Quoted 29 lines · Sasha Levin
Quoted 27 lines · On Sun, Jan 19, 2020 at 02:41:16PM +0100, [email protected] wrote:
The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3018dd3fa114b13261e9599ddb5656ef97a1fa17 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 17 Jan 2020 10:50:25 +0100
Subject: [PATCH] USB: serial: keyspan: handle unbound ports
Check for NULL port data in the control URB completion handlers to avoid dereferencing a NULL pointer in the unlikely case where a port device isn't bound to a driver (e.g. after an allocation failure on port probe()).
Fixes 0ca1268e109a ("USB Serial Keyspan: add support for USA-49WG & USA-28XG")
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc stable <[email protected]>
Reviewed-by Greg Kroah-Hartman <[email protected]>
Signed-off-by Johan Hovold <[email protected]>

Quoted 6 lines

Quoted 2 lines
Grabbing the prerequisite for the other USB patch also resolved the conflict here, now queued for 4.9 and 4.4.
Just curious; which prerequisite are referring to here? I can't seem to understand why this one failed to apply to 4.9 in the first place as there hasn't really been any changes to that code in the keyspan driver.

I thought that it was either dd1fae527612 ("USB: serial: io_edgeport:
use irqsave() in USB's complete callback") or the stable commit that was applied on top, but you're right - it doesn't seem to be either of those.

Signature · 2 lines

Thanks,
Sasha

Johan Hovold

maintainer

2020-01-20 08:08 UTC #5 lore raw

Quoted 34 lines · Sasha Levin

Quoted 33 lines · Johan Hovold
Quoted 31 lines · Sasha Levin
Quoted 22 lines · On Sun, Jan 19, 2020 at 02:41:16PM +0100, [email protected] wrote:
The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3018dd3fa114b13261e9599ddb5656ef97a1fa17 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 17 Jan 2020 10:50:25 +0100
Subject: [PATCH] USB: serial: keyspan: handle unbound ports
Check for NULL port data in the control URB completion handlers to avoid dereferencing a NULL pointer in the unlikely case where a port device isn't bound to a driver (e.g. after an allocation failure on port probe()).
Quoted 5 lines
Fixes 0ca1268e109a ("USB Serial Keyspan: add support for USA-49WG & USA-28XG")
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc stable <[email protected]>
Reviewed-by Greg Kroah-Hartman <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
Grabbing the prerequisite for the other USB patch also resolved the conflict here, now queued for 4.9 and 4.4.

Quoted 8 lines

Quoted 3 lines
Just curious; which prerequisite are referring to here? I can't seem to understand why this one failed to apply to 4.9 in the first place as there hasn't really been any changes to that code in the keyspan driver.
I thought that it was either dd1fae527612 ("USB: serial: io_edgeport:
use irqsave() in USB's complete callback") or the stable commit that was applied on top, but you're right - it doesn't seem to be either of those.

Thanks for confirming, and for doing the backports.

Johan