Commit 02a2cad8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:
 "Fixes to various USB drivers to validate existence of endpoints before
  trying to use them, fixes to APLS v8 protocol, and a couple of i8042
  quirks"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ALPS - fix trackstick button handling on V8 devices
  Input: ALPS - fix V8+ protocol handling (73 03 28)
  Input: sur40 - validate number of endpoints before using them
  Input: kbtab - validate number of endpoints before using them
  Input: hanwang - validate number of endpoints before using them
  Input: yealink - validate number of endpoints before using them
  Input: ims-pcu - validate number of endpoints before using them
  Input: cm109 - validate number of endpoints before using them
  Input: iforce - validate number of endpoints before using them
  Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw
  Input: i8042 - add TUXEDO BU1406 (N24_25BU) to the nomux list
  Input: synaptics-rmi4 - prevent null pointer dereference in f30
  Input: i8042 - add noloop quirk for Dell Embedded Box PC 3000
parents d038e3dc 47e6fb42

drivers/input/joystick/iforce/iforce-usb.c

+3 −0
Original line number Diff line number Diff line
@@ -141,6 +141,9 @@ static int iforce_usb_probe(struct usb_interface *intf, 


	interface = intf->cur_altsetting;



	if (interface->desc.bNumEndpoints < 2)

		return -ENODEV;



	epirq = &interface->endpoint[0].desc;

	epout = &interface->endpoint[1].desc;

drivers/input/misc/cm109.c

+4 −0
Original line number Diff line number Diff line
@@ -700,6 +700,10 @@ static int cm109_usb_probe(struct usb_interface *intf, 
	int error = -ENOMEM;



	interface = intf->cur_altsetting;



	if (interface->desc.bNumEndpoints < 1)

		return -ENODEV;



	endpoint = &interface->endpoint[0].desc;



	if (!usb_endpoint_is_int_in(endpoint))

drivers/input/misc/ims-pcu.c

+4 −0
Original line number Diff line number Diff line
@@ -1667,6 +1667,10 @@ static int ims_pcu_parse_cdc_data(struct usb_interface *intf, struct ims_pcu *pc 
		return -EINVAL;



	alt = pcu->ctrl_intf->cur_altsetting;



	if (alt->desc.bNumEndpoints < 1)

		return -ENODEV;



	pcu->ep_ctrl = &alt->endpoint[0].desc;

	pcu->max_ctrl_size = usb_endpoint_maxp(pcu->ep_ctrl);

drivers/input/misc/yealink.c

+4 −0
Original line number Diff line number Diff line
@@ -875,6 +875,10 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	int ret, pipe, i;



	interface = intf->cur_altsetting;



	if (interface->desc.bNumEndpoints < 1)

		return -ENODEV;



	endpoint = &interface->endpoint[0].desc;

	if (!usb_endpoint_is_int_in(endpoint))

		return -ENODEV;

drivers/input/mouse/alps.c

+52 −20
Original line number Diff line number Diff line
@@ -1282,10 +1282,8 @@ static int alps_decode_ss4_v2(struct alps_fields *f, 
	/* handle buttons */

	if (pkt_id == SS4_PACKET_ID_STICK) {

		f->ts_left = !!(SS4_BTN_V2(p) & 0x01);

		if (!(priv->flags & ALPS_BUTTONPAD)) {

		f->ts_right = !!(SS4_BTN_V2(p) & 0x02);

		f->ts_middle = !!(SS4_BTN_V2(p) & 0x04);

		}

	} else {

		f->left = !!(SS4_BTN_V2(p) & 0x01);

		if (!(priv->flags & ALPS_BUTTONPAD)) {
@@ -2462,14 +2460,34 @@ static int alps_update_device_area_ss4_v2(unsigned char otp[][4], 
	int num_y_electrode;

	int x_pitch, y_pitch, x_phys, y_phys;



	num_x_electrode = SS4_NUMSENSOR_XOFFSET + (otp[1][0] & 0x0F);

	num_y_electrode = SS4_NUMSENSOR_YOFFSET + ((otp[1][0] >> 4) & 0x0F);

	if (IS_SS4PLUS_DEV(priv->dev_id)) {

		num_x_electrode =

			SS4PLUS_NUMSENSOR_XOFFSET + (otp[0][2] & 0x0F);

		num_y_electrode =

			SS4PLUS_NUMSENSOR_YOFFSET + ((otp[0][2] >> 4) & 0x0F);



		priv->x_max =

			(num_x_electrode - 1) * SS4PLUS_COUNT_PER_ELECTRODE;

		priv->y_max =

			(num_y_electrode - 1) * SS4PLUS_COUNT_PER_ELECTRODE;



		x_pitch = (otp[0][1] & 0x0F) + SS4PLUS_MIN_PITCH_MM;

		y_pitch = ((otp[0][1] >> 4) & 0x0F) + SS4PLUS_MIN_PITCH_MM;



	} else {

		num_x_electrode =

			SS4_NUMSENSOR_XOFFSET + (otp[1][0] & 0x0F);

		num_y_electrode =

			SS4_NUMSENSOR_YOFFSET + ((otp[1][0] >> 4) & 0x0F);



	priv->x_max = (num_x_electrode - 1) * SS4_COUNT_PER_ELECTRODE;

	priv->y_max = (num_y_electrode - 1) * SS4_COUNT_PER_ELECTRODE;

		priv->x_max =

			(num_x_electrode - 1) * SS4_COUNT_PER_ELECTRODE;

		priv->y_max =

			(num_y_electrode - 1) * SS4_COUNT_PER_ELECTRODE;



		x_pitch = ((otp[1][2] >> 2) & 0x07) + SS4_MIN_PITCH_MM;

		y_pitch = ((otp[1][2] >> 5) & 0x07) + SS4_MIN_PITCH_MM;

	}



	x_phys = x_pitch * (num_x_electrode - 1); /* In 0.1 mm units */

	y_phys = y_pitch * (num_y_electrode - 1); /* In 0.1 mm units */
@@ -2485,6 +2503,9 @@ static int alps_update_btn_info_ss4_v2(unsigned char otp[][4], 
{

	unsigned char is_btnless;



	if (IS_SS4PLUS_DEV(priv->dev_id))

		is_btnless = (otp[1][0] >> 1) & 0x01;

	else

		is_btnless = (otp[1][1] >> 3) & 0x01;



	if (is_btnless)
@@ -2493,6 +2514,21 @@ static int alps_update_btn_info_ss4_v2(unsigned char otp[][4], 
	return 0;

}



static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],

				       struct alps_data *priv)

{

	bool is_dual = false;



	if (IS_SS4PLUS_DEV(priv->dev_id))

		is_dual = (otp[0][0] >> 4) & 0x01;



	if (is_dual)

		priv->flags |= ALPS_DUALPOINT |

					ALPS_DUALPOINT_WITH_PRESSURE;



	return 0;

}



static int alps_set_defaults_ss4_v2(struct psmouse *psmouse,

				    struct alps_data *priv)

{
@@ -2508,6 +2544,8 @@ static int alps_set_defaults_ss4_v2(struct psmouse *psmouse, 


	alps_update_btn_info_ss4_v2(otp, priv);



	alps_update_dual_info_ss4_v2(otp, priv);



	return 0;

}
@@ -2753,10 +2791,6 @@ static int alps_set_protocol(struct psmouse *psmouse, 
		if (alps_set_defaults_ss4_v2(psmouse, priv))

			return -EIO;



		if (priv->fw_ver[1] == 0x1)

			priv->flags |= ALPS_DUALPOINT |

					ALPS_DUALPOINT_WITH_PRESSURE;



		break;

	}
@@ -2827,10 +2861,7 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) 
			   ec[2] >= 0x90 && ec[2] <= 0x9d) {

			protocol = &alps_v3_protocol_data;

		} else if (e7[0] == 0x73 && e7[1] == 0x03 &&

			   e7[2] == 0x14 && ec[1] == 0x02) {

			protocol = &alps_v8_protocol_data;

		} else if (e7[0] == 0x73 && e7[1] == 0x03 &&

			   e7[2] == 0x28 && ec[1] == 0x01) {

			   (e7[2] == 0x14 || e7[2] == 0x28)) {

			protocol = &alps_v8_protocol_data;

		} else {

			psmouse_dbg(psmouse,
@@ -2840,7 +2871,8 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) 
	}



	if (priv) {

		/* Save the Firmware version */

		/* Save Device ID and Firmware version */

		memcpy(priv->dev_id, e7, 3);

		memcpy(priv->fw_ver, ec, 3);

		error = alps_set_protocol(psmouse, priv, protocol);

		if (error)

CRA Git | Maintained and supported by SUSTech CRA and CCSE