From: Frank Praznik Date: Thu, 20 Feb 2014 16:36:02 +0000 (-0500) Subject: HID: sony: Perform a boundry check on the sixaxis battery level index. X-Git-Tag: MMI-PSA29.97-13-9~12475^2~1^3~5 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac3c9a94094b515ab135886eb4547bb889d5b31a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git HID: sony: Perform a boundry check on the sixaxis battery level index. Make sure that an out-of-bounds read doesn't occur in the Sixaxis battery level lookup table in the event that the controller sends an invalid battery status value in the report. Signed-off-by: Frank Praznik Reviewed-by: David Herrmann Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index a51a9c0636be..b39e3abd6cdd 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -854,7 +854,8 @@ static void sixaxis_parse_report(struct sony_sc *sc, __u8 *rd, int size) battery_capacity = 100; battery_charging = !(rd[30] & 0x01); } else { - battery_capacity = sixaxis_battery_capacity[rd[30]]; + __u8 index = rd[30] <= 5 ? rd[30] : 5; + battery_capacity = sixaxis_battery_capacity[index]; battery_charging = 0; } cable_state = !((rd[31] >> 4) & 0x01);