Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac3c9a94 authored by Frank Praznik's avatar Frank Praznik Committed by Jiri Kosina
Browse files

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: default avatarFrank Praznik <frank.praznik@oh.rr.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c8de9dbb

drivers/hid/hid-sony.c

+2 −1
Original line number Diff line number Diff line
@@ -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);