tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "usb: typec: class: Fix NULL pointer access"

Browse Source 
This reverts commit de7c24febd which is
commit ec27386de23a511008c53aa2f3434ad180a3ca9a upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: If6fb15b099262221cddc74b8cf0fcf406a2bc23c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-05-21 14:41:07 +00:00
parent 9bc73ad3e8
commit 5562e5e9bc
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usb/typec/class.c
+2 -13
View File
@@ -932,7 +932,6 @@ struct typec_partner *typec_register_partner(struct typec_port *port,
partner->dev.type = &typec_partner_dev_type; partner->dev.type = &typec_partner_dev_type;
dev_set_name(&partner->dev, "%s-partner", dev_name(&port->dev)); dev_set_name(&partner->dev, "%s-partner", dev_name(&port->dev));
mutex_lock(&port->partner_link_lock);
ret = device_register(&partner->dev); ret = device_register(&partner->dev);
if (ret) { if (ret) {
dev_err(&port->dev, "failed to register partner (%d)\n", ret); dev_err(&port->dev, "failed to register partner (%d)\n", ret);
@@ -944,7 +943,6 @@ struct typec_partner *typec_register_partner(struct typec_port *port,
typec_partner_link_device(partner, port->usb2_dev); typec_partner_link_device(partner, port->usb2_dev);
if (port->usb3_dev) if (port->usb3_dev)
typec_partner_link_device(partner, port->usb3_dev); typec_partner_link_device(partner, port->usb3_dev);
mutex_unlock(&port->partner_link_lock);
return partner; return partner;
} }
@@ -965,14 +963,12 @@ void typec_unregister_partner(struct typec_partner *partner)
port = to_typec_port(partner->dev.parent); port = to_typec_port(partner->dev.parent);
mutex_lock(&port->partner_link_lock);
if (port->usb2_dev) if (port->usb2_dev)
typec_partner_unlink_device(partner, port->usb2_dev); typec_partner_unlink_device(partner, port->usb2_dev);
if (port->usb3_dev) if (port->usb3_dev)
typec_partner_unlink_device(partner, port->usb3_dev); typec_partner_unlink_device(partner, port->usb3_dev);
device_unregister(&partner->dev); device_unregister(&partner->dev);
mutex_unlock(&port->partner_link_lock);
} }
EXPORT_SYMBOL_GPL(typec_unregister_partner); EXPORT_SYMBOL_GPL(typec_unregister_partner);
@@ -1866,30 +1862,25 @@ static struct typec_partner *typec_get_partner(struct typec_port *port)
static void typec_partner_attach(struct typec_connector *con, struct device *dev) static void typec_partner_attach(struct typec_connector *con, struct device *dev)
{ {
struct typec_port *port = container_of(con, struct typec_port, con); struct typec_port *port = container_of(con, struct typec_port, con);
struct typec_partner *partner; struct typec_partner *partner = typec_get_partner(port);
struct usb_device *udev = to_usb_device(dev); struct usb_device *udev = to_usb_device(dev);
mutex_lock(&port->partner_link_lock);
if (udev->speed < USB_SPEED_SUPER) if (udev->speed < USB_SPEED_SUPER)
port->usb2_dev = dev; port->usb2_dev = dev;
else else
port->usb3_dev = dev; port->usb3_dev = dev;
partner = typec_get_partner(port);
if (partner) { if (partner) {
typec_partner_link_device(partner, dev); typec_partner_link_device(partner, dev);
put_device(&partner->dev); put_device(&partner->dev);
} }
mutex_unlock(&port->partner_link_lock);
} }
static void typec_partner_deattach(struct typec_connector *con, struct device *dev) static void typec_partner_deattach(struct typec_connector *con, struct device *dev)
{ {
struct typec_port *port = container_of(con, struct typec_port, con); struct typec_port *port = container_of(con, struct typec_port, con);
struct typec_partner *partner; struct typec_partner *partner = typec_get_partner(port);
mutex_lock(&port->partner_link_lock);
partner = typec_get_partner(port);
if (partner) { if (partner) {
typec_partner_unlink_device(partner, dev); typec_partner_unlink_device(partner, dev);
put_device(&partner->dev); put_device(&partner->dev);
@@ -1899,7 +1890,6 @@ static void typec_partner_deattach(struct typec_connector *con, struct device *d
port->usb2_dev = NULL; port->usb2_dev = NULL;
else if (port->usb3_dev == dev) else if (port->usb3_dev == dev)
port->usb3_dev = NULL; port->usb3_dev = NULL;
mutex_unlock(&port->partner_link_lock);
} }
/** /**
@@ -2435,7 +2425,6 @@ struct typec_port *typec_register_port(struct device *parent,
ida_init(&port->mode_ids); ida_init(&port->mode_ids);
mutex_init(&port->port_type_lock); mutex_init(&port->port_type_lock);
mutex_init(&port->partner_link_lock);
port->id = id; port->id = id;
port->ops = cap->ops; port->ops = cap->ops;
drivers/usb/typec/class.h
-1
View File
@@ -60,7 +60,6 @@ struct typec_port {
enum typec_pwr_opmode pwr_opmode; enum typec_pwr_opmode pwr_opmode;
enum typec_port_type port_type; enum typec_port_type port_type;
struct mutex port_type_lock; struct mutex port_type_lock;
struct mutex partner_link_lock;
enum typec_orientation orientation; enum typec_orientation orientation;
struct typec_switch *sw; struct typec_switch *sw;