Skip to content

Commit

Permalink
Input: atmel_mxt_ts - fix double free in mxt_read_info_block
Browse files Browse the repository at this point in the history
commit 12f247a upstream.

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")
Fixes: 068bdb6 ("Input: atmel_mxt_ts - fix the firmware update")
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Link: https://lore.kernel.org/r/20211212194257.68879-1-jose.exposito89@gmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
JoseExposito authored and gregkh committed Dec 29, 2021
1 parent 6084a6c commit 7f7f610
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/input/touchscreen/atmel_mxt_ts.c
Expand Up @@ -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);
Expand Down

0 comments on commit 7f7f610

Please sign in to comment.