Takashi Iwai 7bf1c4
From 79aae6acbef16f720a7949f8fc6ac69816c79d62 Mon Sep 17 00:00:00 2001
Takashi Iwai 7bf1c4
From: Pan Bian <bianpan2016@163.com>
Takashi Iwai 7bf1c4
Date: Tue, 12 Nov 2019 17:04:54 -0800
Takashi Iwai 7bf1c4
Subject: [PATCH] Input: cyttsp4_core - fix use after free bug
Takashi Iwai 7bf1c4
Git-commit: 79aae6acbef16f720a7949f8fc6ac69816c79d62
Takashi Iwai 7bf1c4
Patch-mainline: v5.4-rc8
Takashi Iwai 7bf1c4
References: bsc#1051510
Takashi Iwai 7bf1c4
Takashi Iwai 7bf1c4
The device md->input is used after it is released. Setting the device
Takashi Iwai 7bf1c4
data to NULL is unnecessary as the device is never used again. Instead,
Takashi Iwai 7bf1c4
md->input should be assigned NULL to avoid accessing the freed memory
Takashi Iwai 7bf1c4
accidently. Besides, checking md->si against NULL is superfluous as it
Takashi Iwai 7bf1c4
points to a variable address, which cannot be NULL.
Takashi Iwai 7bf1c4
Takashi Iwai 7bf1c4
Signed-off-by: Pan Bian <bianpan2016@163.com>
Takashi Iwai 7bf1c4
Link: https://lore.kernel.org/r/1572936379-6423-1-git-send-email-bianpan2016@163.com
Takashi Iwai 7bf1c4
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Takashi Iwai 7bf1c4
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 7bf1c4
Takashi Iwai 7bf1c4
---
Takashi Iwai 7bf1c4
 drivers/input/touchscreen/cyttsp4_core.c | 7 -------
Takashi Iwai 7bf1c4
 1 file changed, 7 deletions(-)
Takashi Iwai 7bf1c4
Takashi Iwai 7bf1c4
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c
Takashi Iwai 7bf1c4
index 4b22d49a0f49..6bcffc930384 100644
Takashi Iwai 7bf1c4
--- a/drivers/input/touchscreen/cyttsp4_core.c
Takashi Iwai 7bf1c4
+++ b/drivers/input/touchscreen/cyttsp4_core.c
Takashi Iwai 7bf1c4
@@ -1990,11 +1990,6 @@ static int cyttsp4_mt_probe(struct cyttsp4 *cd)
Takashi Iwai 7bf1c4
 
Takashi Iwai 7bf1c4
 	/* get sysinfo */
Takashi Iwai 7bf1c4
 	md->si = &cd->sysinfo;
Takashi Iwai 7bf1c4
-	if (!md->si) {
Takashi Iwai 7bf1c4
-		dev_err(dev, "%s: Fail get sysinfo pointer from core p=%p\n",
Takashi Iwai 7bf1c4
-			__func__, md->si);
Takashi Iwai 7bf1c4
-		goto error_get_sysinfo;
Takashi Iwai 7bf1c4
-	}
Takashi Iwai 7bf1c4
 
Takashi Iwai 7bf1c4
 	rc = cyttsp4_setup_input_device(cd);
Takashi Iwai 7bf1c4
 	if (rc)
Takashi Iwai 7bf1c4
@@ -2004,8 +1999,6 @@ static int cyttsp4_mt_probe(struct cyttsp4 *cd)
Takashi Iwai 7bf1c4
 
Takashi Iwai 7bf1c4
 error_init_input:
Takashi Iwai 7bf1c4
 	input_free_device(md->input);
Takashi Iwai 7bf1c4
-error_get_sysinfo:
Takashi Iwai 7bf1c4
-	input_set_drvdata(md->input, NULL);
Takashi Iwai 7bf1c4
 error_alloc_failed:
Takashi Iwai 7bf1c4
 	dev_err(dev, "%s failed.\n", __func__);
Takashi Iwai 7bf1c4
 	return rc;
Takashi Iwai 7bf1c4
-- 
Takashi Iwai 7bf1c4
2.16.4
Takashi Iwai 7bf1c4