From 9a8f9bb032f294237586b03577ef6fb879a971aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Sat, 28 Sep 2019 18:00:33 +0200 Subject: [PATCH 064/389] input: cyttsp4: Clear the ids buffer in a saner way Fixes memory corruption / NPE failures during touch data acquisition. Signed-off-by: Ondrej Jirman --- drivers/input/touchscreen/cyttsp4_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c index be8c460d4a37..3addb701f504 100644 --- a/drivers/input/touchscreen/cyttsp4_core.c +++ b/drivers/input/touchscreen/cyttsp4_core.c @@ -854,10 +854,9 @@ static void cyttsp4_get_mt_touches(struct cyttsp4 *cd, int num_cur_tch) struct cyttsp4_sysinfo *si = cd->si; struct cyttsp4_touch tch; int i, j, t = 0; - int ids[max(CY_TMA1036_MAX_TCH, CY_TMA4XX_MAX_TCH)]; + int ids[CY_TMA4XX_MAX_TCH + 1] = {0}; struct cyttsp4_signal_def* sig; - memset(ids, 0, si->si_ofs.tch_abs[CY_TCH_T].max * sizeof(int)); for (i = 0; i < num_cur_tch; i++) { cyttsp4_get_touch(cd, &tch, si->xy_data + (i * si->si_ofs.tch_rec_size)); -- 2.35.3