usb: typec: tcpm: Validate SVID index in svdm_consume_modes()
Subsystems (3)
Badhri Jagan Sridharan
maintainerPATCH 1/1 usb: typec: tcpm: Validate SVID index in svdm_consume_modes()
In svdm_consume_modes(), the SVID value is read from pmdata->svids using pmdata->svid_index as an array index without bounds validation:
paltmode->svid = pmdata->svids[pmdata->svid_index];
If pmdata->svid_index is driven beyond SVID_DISCOVERY_MAX (16), it results in an out-of-bounds read of the pmdata->svids array. Because pd_mode_data is embedded inside struct tcpm_port, indexing past svids reads into adjacent fields. In particular:
- At index 16, it reads the altmodes count.
- At index 18 and beyond, it reads into altmode_desc[], which contains partner-supplied SVDM Discovery Modes VDOs.
By injecting a chosen SVID into altmode_desc[0].vdo and driving svid_index to 20, the partner can force paltmode->svid to be loaded with an arbitrary, partner- chosen SVID, which is then registered via typec_partner_register_altmode().
Fix this by validating that pmdata->svid_index is non-negative and strictly less than pmdata->nsvids before accessing the pmdata->svids array inside svdm_consume_modes().
--- drivers/usb/typec/tcpm/tcpm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/typec/tcpm/tcpm.c +5 -0
@@ -2000,6 +2000,11 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,return ; } +if (pmdata->svid_index <0 || pmdata->svid_index >= pmdata->nsvids) { +tcpm_log (port,"Invalid SVID index %d" , pmdata->svid_index); +return ; + } +for (i =1 ; i < cnt; i++) {if (pmdata->altmodes >=ALTMODE_DISCOVERY_MAX ) {/* Already logged in svdm_consume_svids() */
base-commit: 1c2b66a7d7257d2652aa41f9a860ecb96dde27dd
Signature · 1 line
2.55.0.rc0.786.g65d90a0328-goog
Quoted 22 lines · Badhri Jagan Sridharan
In
svdm_consume_modes(), the SVID value is read frompmdata->svidsusingpmdata->svid_indexas an array index without bounds validation:paltmode->svid = pmdata->svids[pmdata->svid_index];If
pmdata->svid_indexis driven beyondSVID_DISCOVERY_MAX(16), it results in an out-of-bounds read of thepmdata->svidsarray. Becausepd_mode_datais embedded inside structtcpm_port, indexing past svids reads into adjacent fields. In particular:
- At index 16, it reads the altmodes count.
- At index 18 and beyond, it reads into altmode_desc[], which contains partner-supplied SVDM Discovery Modes VDOs.By injecting a chosen SVID into altmode_desc[0].vdo and driving
svid_indexto 20, the partner can forcepaltmode->svidto be loaded with an arbitrary, partner- chosen SVID, which is then registered viatypec_partner_register_altmode().Fix this by validating that
pmdata->svid_indexis non-negative and strictly less thanpmdata->nsvidsbefore accessing thepmdata->svidsarray insidesvdm_consume_modes().
Quoted 5 lines
Assisted-by Antigravity:gemini-3.5-flashFixes 4ab8c18d4d67 ("usb: typec: Register a device for every mode")Cc stable <[email protected]>Signed-off-by Badhri Jagan Sridharan <[email protected]>Reviewed-by RD Babiera <[email protected]>
Quoted 24 lines
--- drivers/usb/typec/tcpm/tcpm.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/usb/typec/tcpm/tcpm.c +5
-0@@ -2000,6 +2000,11 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,return ; } +if (pmdata->svid_index <0 || pmdata->svid_index >= pmdata->nsvids) { +tcpm_log (port,"Invalid SVID index %d" , pmdata->svid_index); +return ; + } +for (i =1 ; i < cnt; i++) {if (pmdata->altmodes >=ALTMODE_DISCOVERY_MAX ) {/* Already logged in svdm_consume_svids() */ base-commit:
1c2b66a7d7257d2652aa41f9a860ecb96dde27ddSignature · 1 line
2.55.0.rc0.786.g65d90a0328-goog
Signature · 1 line
heikki