Skip to content

Commit ae11f04

Browse files
Badhri Jagan Sridharangregkh
authored andcommitted
usb: typec: tcpm: Check for port partner validity before consuming it
typec_register_partner() does not guarantee partner registration to always succeed. In the event of failure, port->partner is set to the error value or NULL. Given that port->partner validity is not checked, this results in the following crash: Unable to handle kernel NULL pointer dereference at virtual address xx pc : run_state_machine+0x1bc8/0x1c08 lr : run_state_machine+0x1b90/0x1c08 .. Call trace: run_state_machine+0x1bc8/0x1c08 tcpm_state_machine_work+0x94/0xe4 kthread_worker_fn+0x118/0x328 kthread+0x1d0/0x23c ret_from_fork+0x10/0x20 To prevent the crash, check for port->partner validity before derefencing it in all the call sites. Cc: stable@vger.kernel.org Fixes: c97cd0b ("usb: typec: tcpm: set initial svdm version based on pd revision") Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20240427202812.3435268-1-badhri@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cdc9946 commit ae11f04

File tree

1 file changed

+23
-7
lines changed

1 file changed

+23
-7
lines changed

drivers/usb/typec/tcpm/tcpm.c

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,7 +1584,8 @@ static void svdm_consume_identity(struct tcpm_port *port, const u32 *p, int cnt)
15841584
port->partner_ident.cert_stat = p[VDO_INDEX_CSTAT];
15851585
port->partner_ident.product = product;
15861586

1587-
typec_partner_set_identity(port->partner);
1587+
if (port->partner)
1588+
typec_partner_set_identity(port->partner);
15881589

15891590
tcpm_log(port, "Identity: %04x:%04x.%04x",
15901591
PD_IDH_VID(vdo),
@@ -1746,6 +1747,9 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
17461747
struct typec_altmode *altmode;
17471748
int i;
17481749

1750+
if (!port->partner)
1751+
return;
1752+
17491753
for (i = 0; i < modep->altmodes; i++) {
17501754
altmode = typec_partner_register_altmode(port->partner,
17511755
&modep->altmode_desc[i]);
@@ -4238,7 +4242,10 @@ static int tcpm_init_vconn(struct tcpm_port *port)
42384242

42394243
static void tcpm_typec_connect(struct tcpm_port *port)
42404244
{
4245+
struct typec_partner *partner;
4246+
42414247
if (!port->connected) {
4248+
port->connected = true;
42424249
/* Make sure we don't report stale identity information */
42434250
memset(&port->partner_ident, 0, sizeof(port->partner_ident));
42444251
port->partner_desc.usb_pd = port->pd_capable;
@@ -4248,9 +4255,13 @@ static void tcpm_typec_connect(struct tcpm_port *port)
42484255
port->partner_desc.accessory = TYPEC_ACCESSORY_AUDIO;
42494256
else
42504257
port->partner_desc.accessory = TYPEC_ACCESSORY_NONE;
4251-
port->partner = typec_register_partner(port->typec_port,
4252-
&port->partner_desc);
4253-
port->connected = true;
4258+
partner = typec_register_partner(port->typec_port, &port->partner_desc);
4259+
if (IS_ERR(partner)) {
4260+
dev_err(port->dev, "Failed to register partner (%ld)\n", PTR_ERR(partner));
4261+
return;
4262+
}
4263+
4264+
port->partner = partner;
42544265
typec_partner_set_usb_power_delivery(port->partner, port->partner_pd);
42554266
}
42564267
}
@@ -4330,9 +4341,11 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
43304341
port->plug_prime = NULL;
43314342
port->cable = NULL;
43324343
if (port->connected) {
4333-
typec_partner_set_usb_power_delivery(port->partner, NULL);
4334-
typec_unregister_partner(port->partner);
4335-
port->partner = NULL;
4344+
if (port->partner) {
4345+
typec_partner_set_usb_power_delivery(port->partner, NULL);
4346+
typec_unregister_partner(port->partner);
4347+
port->partner = NULL;
4348+
}
43364349
port->connected = false;
43374350
}
43384351
}
@@ -4556,6 +4569,9 @@ static enum typec_cc_status tcpm_pwr_opmode_to_rp(enum typec_pwr_opmode opmode)
45564569

45574570
static void tcpm_set_initial_svdm_version(struct tcpm_port *port)
45584571
{
4572+
if (!port->partner)
4573+
return;
4574+
45594575
switch (port->negotiated_rev) {
45604576
case PD_REV30:
45614577
break;

0 commit comments

Comments
 (0)