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

!10147 CVE-2022-48836 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuan Can <yuancan@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VRJFSSPYTUTVCDKPFEZYHPGFU3DIFNTK/ 
Johan Hovold (1):
  Input: aiptek - fix endpoint sanity check

Pavel Skripkin (1):
  Input: aiptek - properly check endpoint type


-- 
2.17.1
 
https://gitee.com/src-openeuler/kernel/issues/IADGSO 
 
Link:https://gitee.com/openeuler/kernel/pulls/10147

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 0f07963f 0f8b3099

drivers/input/tablet/aiptek.c

+4 −6
Original line number Diff line number Diff line
@@ -1814,15 +1814,13 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);

	input_set_abs_params(inputdev, ABS_WHEEL, AIPTEK_WHEEL_MIN, AIPTEK_WHEEL_MAX - 1, 0, 0);



	/* Verify that a device really has an endpoint */

	if (intf->altsetting[0].desc.bNumEndpoints < 1) {

	err = usb_find_common_endpoints(intf->cur_altsetting,

					NULL, NULL, &endpoint, NULL);

	if (err) {

		dev_err(&intf->dev,

			"interface has %d endpoints, but must have minimum 1\n",

			intf->altsetting[0].desc.bNumEndpoints);

		err = -EINVAL;

			"interface has no int in endpoints, but must have minimum 1\n");

		goto fail3;

	}

	endpoint = &intf->altsetting[0].endpoint[0].desc;



	/* Go set up our URB, which is called when the tablet receives

	 * input.