FAILED: patch "[PATCH] usb: typec: fix use after free in typec_register_port()" failed to apply to 4.19-stable tree

PATCH [email protected] 2 participants 2 messages Dec 15, 2019

Subsystems (3)

Stable branch USB USB Type-C class

lore

Share & tools

lore

[email protected]

author maintainer

2019-12-15 11:06 UTC #0 lore raw

The patch below does not apply to the 4.19-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 5c388abefda0d92355714010c0199055c57ab6c7 Mon Sep 17 00:00:00 2001
From: Wen Yang <[email protected]>
Date: Tue, 26 Nov 2019 22:04:52 +0800
Subject: [PATCH] usb: typec: fix use after free in typec_register_port()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can't use "port->sw" and/or "port->mux" after it has been freed.

Fixes 23481121c81d ("usb: typec: class: Don't use port parent for getting mux handles")

Signed-off-by Wen Yang <[email protected]>

Cc stable <[email protected]>

Cc [email protected]

Acked-by Heikki Krogerus <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Greg Kroah-Hartman <[email protected]>

drivers/usb/typec/class.c +4 -2

index 7ece6ca6e690..91d62276b56f 100644
@@ -1612,14 +1612,16 @@ struct typec_port *typec_register_port(struct device *parent,
 
 	port->sw = typec_switch_get(&port->dev);
 	if (IS_ERR(port->sw)) {
+		ret = PTR_ERR(port->sw);
 		put_device(&port->dev);
-		return ERR_CAST(port->sw);
+		return ERR_PTR(ret);
 	}
 
 	port->mux = typec_mux_get(&port->dev, NULL);
 	if (IS_ERR(port->mux)) {
+		ret = PTR_ERR(port->mux);
 		put_device(&port->dev);
-		return ERR_CAST(port->mux);
+		return ERR_PTR(ret);
 	}
 
 	ret = device_add(&port->dev);

Sasha Levin

maintainer

2019-12-15 18:40 UTC #1 lore raw

Quoted 22 lines · On Sun, Dec 15, 2019 at 12:06:01PM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-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 5c388abefda0d92355714010c0199055c57ab6c7 Mon Sep 17 00:00:00 2001
From: Wen Yang <[email protected]>
Date: Tue, 26 Nov 2019 22:04:52 +0800
Subject: [PATCH] usb: typec: fix use after free in typec_register_port()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We can't use "port->sw" and/or "port->mux" after it has been freed.

Quoted 8 lines

Fixes 23481121c81d ("usb: typec: class: Don't use port parent for getting mux handles")
Signed-off-by Wen Yang <[email protected]>
Cc stable <[email protected]>
Cc [email protected]
Cc [email protected]
Acked-by Heikki Krogerus <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Greg Kroah-Hartman <[email protected]>

Fixed up context and queued up for 4.19.

Signature · 2 lines

Thanks,
Sasha