Hi Joonyoung Shim ,
Can this patch be fixed in?
if kzalloc memroy for data was faild, it will multi free data
memory space. so check the data memory first, is it kzalloc faild
for data, it should goto end and do nothing.
Signed-off-by: LiuQi <lingjiujianke@xxxxxxxxx>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c
b/drivers/input/touchscreen/atmel_mxt_ts.c
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1039,8 +1039,15 @@ static int __devinit mxt_probe(struct i2c_client *client,
return -EINVAL;
data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL);
+
+ if(!data){
+ dev_err(&client->dev, "Failed to allocate memory\n");
+ error = -ENOMEM;
+ goto err_alloc_data_mem_faild;
+ }
+
input_dev = input_allocate_device();
- if (!data || !input_dev) {
+ if (!input_dev) {
dev_err(&client->dev, "Failed to allocate memory\n");
error = -ENOMEM;
goto err_free_mem;
@@ -1107,9 +1114,10 @@ err_free_irq:
free_irq(client->irq, data);
err_free_object:
kfree(data->object_table);
-err_free_mem:
input_free_device(input_dev);
+err_free_mem:
kfree(data);
+err_alloc_data_mem_faild:
return error;
}
Best Regards
Steven Liu
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
