redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

usb: typec: ucsi: Prevent mode overrun 

Sometimes the embedded controller firmware does not
terminate the list of alternate modes that the partner
supports in its response to the GET_ALTERNATE_MODES command.
Instead the firmware returns the supported alternate modes
over and over again until the driver stops requesting them.

If that happens, the number of modes for each alternate mode
will exceed the maximum 6 that is defined in the USB Power
Delivery specification. Making sure that can't happen by
adding a check for it.

This fixes NULL pointer dereference that is caused by the
overrun.

Fixes: ad74b8649b ("usb: typec: ucsi: Preliminary support for alternate modes")
Cc: stable@vger.kernel.org
Reported-by: Zwane Mwaikambo <zwanem@gmail.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20200916090034.25119-3-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
zero-sugar-mainline-defconfig
Heikki Krogerus 2020-09-16 12:00:34 +03:00 committed by Greg Kroah-Hartman
parent 130a96d698
commit 386e15a650
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/typec/ucsi/ucsi.c
View File

@ -216,14 +216,18 @@ void ucsi_altmode_update_active(struct ucsi_connector *con)
con->partner_altmode[i] == altmode);
}
static u8 ucsi_altmode_next_mode(struct typec_altmode **alt, u16 svid)
static int ucsi_altmode_next_mode(struct typec_altmode **alt, u16 svid)
{
u8 mode = 1;
int i;
for (i = 0; alt[i]; i++)
for (i = 0; alt[i]; i++) {
if (i > MODE_DISCOVERY_MAX)
return -ERANGE;
if (alt[i]->svid == svid)
mode++;
}
return mode;
}
@ -258,8 +262,11 @@ static int ucsi_register_altmode(struct ucsi_connector *con,
goto err;
}
desc->mode = ucsi_altmode_next_mode(con->port_altmode,
desc->svid);
ret = ucsi_altmode_next_mode(con->port_altmode, desc->svid);
if (ret < 0)
return ret;
desc->mode = ret;
switch (desc->svid) {
case USB_TYPEC_DP_SID:
@ -292,8 +299,11 @@ static int ucsi_register_altmode(struct ucsi_connector *con,
goto err;
}
desc->mode = ucsi_altmode_next_mode(con->partner_altmode,
desc->svid);
ret = ucsi_altmode_next_mode(con->partner_altmode, desc->svid);
if (ret < 0)
return ret;
desc->mode = ret;
alt = typec_partner_register_altmode(con->partner, desc);
if (IS_ERR(alt)) {