linux-kernel - [PATCH 1/1] Input: cypress_ps2 - Return zero finger count if palm is detected.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 24 Sep 2013 11:44:38 -0400
From:	Joseph Salisbury <joseph.salisbury@...onical.com>
To:	linux-kernel@...r.kernel.org
Cc:	dmitry.torokhov@...il.com, rydberg@...omail.se,
	kamal@...onical.com, dudl@...ress.com, git@...tus.e4ward.com,
	tim.gardner@...onical.com, linux-input@...r.kernel.org,
	stable@...r.kernel.org
Subject: [PATCH 1/1] Input: cypress_ps2 - Return zero finger count if palm is detected.

BugLink: http://bugs.launchpad.net/bugs/1229361

This patch sets the finger count to 0 in the case of palm contact.

Signed-off-by: Joseph Salisbury <joseph.salisbury@...onical.com>
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com> (maintainer:INPUT (KEYBOARD,...,commit_signer:2/2=100%)
Cc: Henrik Rydberg <rydberg@...omail.se> (maintainer:INPUT MULTITOUCH...)
Cc: Kamal Mostafa <kamal@...onical.com> (commit_signer:2/2=100%)
Cc: Dudley Du <dudl@...ress.com> (commit_signer:2/2=100%)
Cc: Kyle Fazzari <git@...tus.e4ward.com> (commit_signer:1/2=50%)
Cc: Tim Gardner <tim.gardner@...onical.com> (commit_signer:1/2=50%)
Cc: linux-input@...r.kernel.org (open list:INPUT (KEYBOARD,...)
Cc: linux-kernel@...r.kernel.org (open list)
Cc: stable@...r.kernel.org

---
 drivers/input/mouse/cypress_ps2.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c
index 45b3eda..95b2c40 100644
--- a/drivers/input/mouse/cypress_ps2.c
+++ b/drivers/input/mouse/cypress_ps2.c
@@ -441,7 +441,7 @@ static int cypress_get_finger_count(unsigned char header_byte)
 			case 2: return 5;
 			default:
 				/* Invalid contact (e.g. palm). Ignore it. */
-				return -1;
+				return 0;
 		}
 	}
 
@@ -460,7 +460,7 @@ static int cypress_parse_packet(struct psmouse *psmouse,
 
 	contact_cnt = cypress_get_finger_count(header_byte);
 
-	if (contact_cnt < 0) /* e.g. palm detect */
+	if (contact_cnt < 0)
 		return -EINVAL;
 
 	report_data->contact_cnt = contact_cnt;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/