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

Commit 74b63417 authored by Jason Gerecke's avatar Jason Gerecke Committed by Dmitry Torokhov
Browse files

Input: wacom - references to 'wacom->data' should use 'unsigned char*' 



'wacom->data' contains raw binary data and can lead to unexpected behavior
if a byte under examination happens to have its MSB set.

Signed-off-by: default avatarJason Gerecke <killertofu@gmail.com>
Tested-by: default avatarAaron Skomra <Aaron.Skomra@wacom.com>
Reviewed-by: default avatarCarl Worth <cworth@cworth.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e9fc413f

drivers/input/tablet/wacom_wac.c

+9 −18
Original line number Diff line number Diff line
@@ -178,10 +178,9 @@ static int wacom_ptu_irq(struct wacom_wac *wacom) 


static int wacom_dtu_irq(struct wacom_wac *wacom)

{

	struct wacom_features *features = &wacom->features;

	char *data = wacom->data;

	unsigned char *data = wacom->data;

	struct input_dev *input = wacom->input;

	int prox = data[1] & 0x20, pressure;

	int prox = data[1] & 0x20;



	dev_dbg(input->dev.parent,

		"%s: received report #%d", __func__, data[0]);
@@ -198,10 +197,7 @@ static int wacom_dtu_irq(struct wacom_wac *wacom) 
	input_report_key(input, BTN_STYLUS2, data[1] & 0x10);

	input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2]));

	input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4]));

	pressure = ((data[7] & 0x01) << 8) | data[6];

	if (pressure < 0)

		pressure = features->pressure_max + pressure + 1;

	input_report_abs(input, ABS_PRESSURE, pressure);

	input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x01) << 8) | data[6]);

	input_report_key(input, BTN_TOUCH, data[1] & 0x05);

	if (!prox) /* out-prox */

		wacom->id[0] = 0;
@@ -906,7 +902,7 @@ static int int_dist(int x1, int y1, int x2, int y2) 
static int wacom_24hdt_irq(struct wacom_wac *wacom)

{

	struct input_dev *input = wacom->input;

	char *data = wacom->data;

	unsigned char *data = wacom->data;

	int i;

	int current_num_contacts = data[61];

	int contacts_to_send = 0;
@@ -959,7 +955,7 @@ static int wacom_24hdt_irq(struct wacom_wac *wacom) 
static int wacom_mt_touch(struct wacom_wac *wacom)

{

	struct input_dev *input = wacom->input;

	char *data = wacom->data;

	unsigned char *data = wacom->data;

	int i;

	int current_num_contacts = data[2];

	int contacts_to_send = 0;
@@ -1038,7 +1034,7 @@ static int wacom_tpc_mt_touch(struct wacom_wac *wacom) 


static int wacom_tpc_single_touch(struct wacom_wac *wacom, size_t len)

{

	char *data = wacom->data;

	unsigned char *data = wacom->data;

	struct input_dev *input = wacom->input;

	bool prox;

	int x = 0, y = 0;
@@ -1074,10 +1070,8 @@ static int wacom_tpc_single_touch(struct wacom_wac *wacom, size_t len) 


static int wacom_tpc_pen(struct wacom_wac *wacom)

{

	struct wacom_features *features = &wacom->features;

	char *data = wacom->data;

	unsigned char *data = wacom->data;

	struct input_dev *input = wacom->input;

	int pressure;

	bool prox = data[1] & 0x20;



	if (!wacom->shared->stylus_in_proximity) /* first in prox */
@@ -1093,10 +1087,7 @@ static int wacom_tpc_pen(struct wacom_wac *wacom) 
		input_report_key(input, BTN_STYLUS2, data[1] & 0x10);

		input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2]));

		input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4]));

		pressure = ((data[7] & 0x01) << 8) | data[6];

		if (pressure < 0)

			pressure = features->pressure_max + pressure + 1;

		input_report_abs(input, ABS_PRESSURE, pressure);

		input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x01) << 8) | data[6]);

		input_report_key(input, BTN_TOUCH, data[1] & 0x05);

		input_report_key(input, wacom->tool[0], prox);

		return 1;
@@ -1107,7 +1098,7 @@ static int wacom_tpc_pen(struct wacom_wac *wacom) 


static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)

{

	char *data = wacom->data;

	unsigned char *data = wacom->data;



	dev_dbg(wacom->input->dev.parent,

		"%s: received report #%d\n", __func__, data[0]);