Unverified Commit 55528811 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11642 HID: cougar: fix slab-out-of-bounds Read in cougar_report_fixup 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yipeng Zou <zouyipeng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AP3IVNZOYUJYS7QFEKHHXYWI3IW6YD2N/ 
 
https://gitee.com/src-openeuler/kernel/issues/IARWXF 
 
Link:https://gitee.com/openeuler/kernel/pulls/11642

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 953610e6 2818adb5

drivers/hid/hid-cougar.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void cougar_fix_g6_mapping(void) 
static __u8 *cougar_report_fixup(struct hid_device *hdev, __u8 *rdesc,

				 unsigned int *rsize)

{

	if (rdesc[2] == 0x09 && rdesc[3] == 0x02 &&

	if (*rsize >= 117 && rdesc[2] == 0x09 && rdesc[3] == 0x02 &&

	    (rdesc[115] | rdesc[116] << 8) >= HID_MAX_USAGES) {

		hid_info(hdev,

			"usage count exceeds max: fixing up report descriptor\n");