[PATCH] Input: atmel_mxt_ts - fix double free in mxt_read_info_block

Subsystems: atmel maxtouch driver, input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE1697d LANDED

Landed in mainline as 12f247ab590a on 2021-12-13.

2 messages, 2 authors, 2021-12-13 · open the first message on its own page

[PATCH] Input: atmel_mxt_ts - fix double free in mxt_read_info_block

From: José Expósito <hidden>
Date: 2021-12-12 19:44:18

The "id_buf" buffer is stored in "data->raw_info_block" and freed by
"mxt_free_object_table" in case of error.

Return instead of jumping to avoid a double free.

Addresses-Coverity-ID: 1474582 ("Double free")
Signed-off-by: José Expósito <redacted>
---
 drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 05de92c0293b..eb66cd2689b7 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1882,7 +1882,7 @@ static int mxt_read_info_block(struct mxt_data *data)
 	if (error) {
 		dev_err(&client->dev, "Error %d parsing object table\n", error);
 		mxt_free_object_table(data);
-		goto err_free_mem;
+		return error;
 	}
 
 	data->object_table = (struct mxt_object *)(id_buf + MXT_OBJECT_START);
-- 
2.25.1

Re: [PATCH] Input: atmel_mxt_ts - fix double free in mxt_read_info_block

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2021-12-13 05:02:53

On Sun, Dec 12, 2021 at 08:42:57PM +0100, José Expósito wrote:
The "id_buf" buffer is stored in "data->raw_info_block" and freed by
"mxt_free_object_table" in case of error.

Return instead of jumping to avoid a double free.

Addresses-Coverity-ID: 1474582 ("Double free")
Signed-off-by: José Expósito <redacted>
Applied, thank you.

-- 
Dmitry
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help