Skip to contentSkip to conversation

usb: typec: fix use after free in typec_register_port()

PATCH In review Wen Yang 2 participants 2 messages Nov 26, 2019

Subsystems (2)
lore
Share & tools
lore

Wen Yang

author
#0 lore raw

PATCH 1/1 usb: typec: fix use after free in typec_register_port()

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")
Cc Heikki Krogerus <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
 drivers/usb/typec/class.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/typec/class.c +4 -2
index 7ece6ca..91d6227 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);
Signature · 1 line
1.8.3.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Wen Yang

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")
Cc Heikki Krogerus <[email protected]>
Quoted 32 lines
---
 drivers/usb/typec/class.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/typec/class.c +4 -2
index 7ece6ca..91d6227 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);
Signature · 1 line
1.8.3.1

thanks,

Signature · 1 line
heikki