[patch] touchscreen/bu21013_ts: null dereference in error handling
From: Dan Carpenter <hidden>
Date: 2010-10-27 10:08:34
Also in:
kernel-janitors
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
If kzalloc() returned NULL then it would lead to a NULL deref after the goto. Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index ccde586..8f120b1 100644
--- a/drivers/input/touchscreen/bu21013_ts.c
+++ b/drivers/input/touchscreen/bu21013_ts.c@@ -446,11 +446,14 @@ static int __devinit bu21013_probe(struct i2c_client *client, } bu21013_data = kzalloc(sizeof(struct bu21013_ts_data), GFP_KERNEL); + if (!bu21013_data) + return -ENOMEM; + in_dev = input_allocate_device(); - if (!bu21013_data || !in_dev) { + if (!in_dev) { dev_err(&client->dev, "device memory alloc failed\n"); error = -ENOMEM; - goto err_free_mem; + goto err_free; } bu21013_data->in_dev = in_dev;
@@ -515,6 +518,7 @@ err_cs_disable: pdata->cs_dis(pdata->cs_pin); err_free_mem: input_free_device(bu21013_data->in_dev); +err_free: kfree(bu21013_data); return error;