| Message ID | 20211212194257.68879-1-jose.exposito89@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 12f247ab590a08856441efdbd351cf2cc8f60a2d |
| Headers | show |
| Series | Input: atmel_mxt_ts - fix double free in mxt_read_info_block | expand |
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 <jose.exposito89@gmail.com> Applied, thank you.
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);
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 <jose.exposito89@gmail.com> --- drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)