Revert "Input: zforce - don't overwrite the stack"

dtor · dtor · commit 3213afb8bf5c · 2015-07-28T10:25:03.000-07:00
This reverts commit 7d01cd2 because with given FRAME_MAXSIZE of 257 the check will never trigger and it causes warnings from GCC (with -Wtype-limits). Also the check was incorrect as it was not accounting for the already read 2 bytes of data stored in the buffer.
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
@@ -429,7 +429,7 @@ static int zforce_read_packet(struct zforce_ts *ts, u8 *buf)
 		goto unlock;
 	}
 
-	if (buf[PAYLOAD_LENGTH] == 0 || buf[PAYLOAD_LENGTH] > FRAME_MAXSIZE) {
+	if (buf[PAYLOAD_LENGTH] == 0) {
 		dev_err(&client->dev, "invalid payload length: %d\n",
 			buf[PAYLOAD_LENGTH]);
 		ret = -EIO;

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ static int zforce_read_packet(struct zforce_ts ts, u8 buf)`
`429`	`429`	`goto unlock;`
`430`	`430`	`}`
`431`	`431`
`432`		`- if (buf[PAYLOAD_LENGTH] == 0 \|\| buf[PAYLOAD_LENGTH] > FRAME_MAXSIZE) {`
	`432`	`+ if (buf[PAYLOAD_LENGTH] == 0) {`
`433`	`433`	`dev_err(&client->dev, "invalid payload length: %d\n",`
`434`	`434`	`buf[PAYLOAD_LENGTH]);`
`435`	`435`	`ret = -EIO;`