mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 22:19:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

usb: typec: ucsi: Don't truncate the reads

Browse Source 
That may silently corrupt the data. Instead, failing attempts
to read more than the interface can handle.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Link: https://lore.kernel.org/r/20240816135859.3499351-3-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus
2024-08-16 16:58:55 +03:00
committed by Greg Kroah-Hartman
parent 9ecf52153b
commit 1d05c382dd
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,12 +99,8 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,
*cci = 0;
/*
* Below UCSI 2.0, MESSAGE_IN was limited to 16 bytes. Truncate the
* reads here.
*/
if (ucsi->version <= UCSI_VERSION_1_2)
size = clamp(size, 0, 16);
if (size > UCSI_MAX_DATA_LENGTH(ucsi))
return -EINVAL;
ret = ucsi->ops->sync_control(ucsi, command);
if (ret)

2
drivers/usb/typec/ucsi/ucsi.h
View File

@@ -415,6 +415,8 @@ struct ucsi {
#define UCSI_DELAY_DEVICE_PDOS BIT(1) /* Reading PDOs fails until the parter is in PD mode */
};
#define UCSI_MAX_DATA_LENGTH(u) (((u)->version < UCSI_VERSION_2_0) ? 0x10 : 0xff)
#define UCSI_MAX_SVID 5
#define UCSI_MAX_ALTMODES (UCSI_MAX_SVID * 6)