mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-28 08:44:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

power: supply: cros_usbpd: Limit port counts to EC_USB_PD_MAX_PORTS

Browse Source 
Currently the cros_usbpd-charger driver probe iterates based on raw
charger port count returned by the embedded controller. The only check
is against the number of USB PD ports which the embedded controller
also defines. A malicious embedded controller could return an inaccurate
port count (up to 255) resulting in an out of bounds write and
subsequent memory corruption.

Update helper functions in cros_usbpd-charger to limit port counts to
EC_USB_PD_MAX_PORTS.

Fixes: 3af15cfacd ("power: supply: cros: add support for dedicated port")
Cc: stable@vger.kernel.org
Signed-off-by: Jameson Thies <jthies@google.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Link: https://patch.msgid.link/20260722195059.1420738-1-jthies@google.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Jameson Thies
2026-07-22 19:50:59 +00:00
committed by Sebastian Reichel
parent 50ffe6eedb
commit 657cd3a42e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/power/supply/cros_usbpd-charger.c
View File

@@ -125,6 +125,11 @@ static int cros_usbpd_charger_get_num_ports(struct charger_data *charger)
if (ret < 0)
return ret;
if (resp.port_count > EC_USB_PD_MAX_PORTS) {
dev_warn(charger->dev, "Charge port count out of bounds\n");
return EC_USB_PD_MAX_PORTS;
}
return resp.port_count;
}
@@ -138,6 +143,11 @@ static int cros_usbpd_charger_get_usbpd_num_ports(struct charger_data *charger)
if (ret < 0)
return ret;
if (resp.num_ports > EC_USB_PD_MAX_PORTS) {
dev_warn(charger->dev, "USB PD port count out of bounds\n");
return EC_USB_PD_MAX_PORTS;
}
return resp.num_ports;
}