2021-12-12 19:44:18

by José Expósito

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

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 <[email protected]>
---
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

2021-12-13 05:02:53

by Dmitry Torokhov

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

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 <[email protected]>

Applied, thank you.

--
Dmitry