usb: typec: altmodes/displayport: do not index invalid pin_assignments
Subsystems (4)
PATCH 1/1 usb: typec: altmodes/displayport: do not index invalid pin_assignments
A poorly implemented DisplayPort Alt Mode port partner can indicate that its pin assignment capabilities are greater than the maximum value, DP_PIN_ASSIGN_F. In this case, calls to pin_assignment_show will cause a BRK exception due to an out of bounds array access.
Prevent for loop in pin_assignment_show from accessing invalid values in pin_assignments by adding DP_PIN_ASSIGN_MAX value in typec_dp.h and using i < DP_PIN_ASSIGN_MAX as a loop condition.
--- drivers/usb/typec/altmodes/displayport.c | 2 +- include/linux/usb/typec_dp.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/usb/typec/altmodes/displayport.c +1 -1
@@ -677,7 +677,7 @@ static ssize_t pin_assignment_show(struct device *dev, assignments =get_current_pin_assignments (dp); -for (i =0 ; assignments; assignments >>=1 , i++) { +for (i =0 ; assignments && i <DP_PIN_ASSIGN_MAX ; assignments >>=1 , i++) {if (assignments &1 ) {if (i == cur) len += sprintf(buf + len, "[%s] ",
include/linux/usb/typec_dp.h +1 -0
@@ -57,6 +57,7 @@ enum {DP_PIN_ASSIGN_D ,DP_PIN_ASSIGN_E ,DP_PIN_ASSIGN_F ,/* Not supported after v1.0b */ + DP_PIN_ASSIGN_MAX, };/* DisplayPort alt mode specific commands */
base-commit: e04c78d86a9699d136910cfc0bdcf01087e3267e
Signature · 1 line
2.50.0.rc2.701.gf1e915cc24-goog
Quoted 10 lines · RD Babiera
A poorly implemented DisplayPort Alt Mode port partner can indicate that its pin assignment capabilities are greater than the maximum value,
DP_PIN_ASSIGN_F. In this case, calls topin_assignment_showwill cause a BRK exception due to an out of bounds array access.Prevent for loop in
pin_assignment_showfrom accessing invalid values inpin_assignmentsby addingDP_PIN_ASSIGN_MAXvalue intypec_dp.hand using i <DP_PIN_ASSIGN_MAXas a loop condition.
Quoted 4 lines
Fixes 0e3bb7d6894d ("usb: typec: Add driver for DisplayPort alternate mode")Signed-off-by RD Babiera <[email protected]>Reviewed-by Badhri Jagan Sridharan <[email protected]>
Quoted 34 lines
--- drivers/usb/typec/altmodes/displayport.c | 2 +- include/linux/usb/typec_dp.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)drivers/usb/typec/altmodes/displayport.c +1
-1@@ -677,7 +677,7 @@ static ssize_t pin_assignment_show(struct device *dev, assignments =get_current_pin_assignments (dp); -for (i =0 ; assignments; assignments >>=1 , i++) { +for (i =0 ; assignments && i <DP_PIN_ASSIGN_MAX ; assignments >>=1 , i++) {if (assignments &1 ) {if (i == cur) len += sprintf(buf + len, "[%s] ",include/linux/usb/typec_dp.h +1
-0@@ -57,6 +57,7 @@ enum {DP_PIN_ASSIGN_D ,DP_PIN_ASSIGN_E ,DP_PIN_ASSIGN_F ,/* Not supported after v1.0b */ + DP_PIN_ASSIGN_MAX, };/* DisplayPort alt mode specific commands */ base-commit:
e04c78d86a9699d136910cfc0bdcf01087e3267eSignature · 1 line
2.50.0.rc2.701.gf1e915cc24-goog
Signature · 1 line
heikki