Commit 7817adb0 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman

usb: typec: Only attempt to link USB ports if there is fwnode

The code that creates the links to the USB ports attached to
a connector inside the system assumed that the ACPI nodes
(fwnodes) always exist for the connectors, but it can not do
that.

There is no guarantee that every USB Type-C connector has
ACPI device node representing it in the ACPI tables, and
even if there are the nodes in the ACPI tables, the _STA
method in those nodes may still return 0 (which means the
device does not exist from ACPI PoW).

This fixes NULL pointer dereference that happens if the
nodes are missing.

Fixes: 730b49aa ("usb: typec: port-mapper: Convert to the component framework")
Reported-and-tested-by: default avatarRobert Święcki <robert@swiecki.net>
Reported-by: default avatarMikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
Tested-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20220124090228.41396-2-heikki.krogerus@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5638b0df
...@@ -56,6 +56,9 @@ int typec_link_ports(struct typec_port *con) ...@@ -56,6 +56,9 @@ int typec_link_ports(struct typec_port *con)
{ {
struct each_port_arg arg = { .port = con, .match = NULL }; struct each_port_arg arg = { .port = con, .match = NULL };
if (!has_acpi_companion(&con->dev))
return 0;
bus_for_each_dev(&acpi_bus_type, NULL, &arg, typec_port_match); bus_for_each_dev(&acpi_bus_type, NULL, &arg, typec_port_match);
/* /*
...@@ -74,5 +77,6 @@ int typec_link_ports(struct typec_port *con) ...@@ -74,5 +77,6 @@ int typec_link_ports(struct typec_port *con)
void typec_unlink_ports(struct typec_port *con) void typec_unlink_ports(struct typec_port *con)
{ {
component_master_del(&con->dev, &typec_aggregate_ops); if (has_acpi_companion(&con->dev))
component_master_del(&con->dev, &typec_aggregate_ops);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment