Commit f1cba532 authored by Dan Carpenter's avatar Dan Carpenter Committed by Dmitry Torokhov

Input: adxl34x - fix leak and use after free

These are a couple smatch issues.  In the original code, if only one of
the allocation fails we leak the other variable so we should goto
out_free_mem.

Also there was a use after free if debugging was enabled and so I moved
the kfree() down a line.
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 0fffed27
...@@ -432,11 +432,10 @@ void adxl34x_resume(struct adxl34x *ac) ...@@ -432,11 +432,10 @@ void adxl34x_resume(struct adxl34x *ac)
if (ac->suspended && !ac->disabled && ac->opened) if (ac->suspended && !ac->disabled && ac->opened)
__adxl34x_enable(ac); __adxl34x_enable(ac);
ac->suspended= false; ac->suspended = false;
mutex_unlock(&ac->mutex); mutex_unlock(&ac->mutex);
} }
EXPORT_SYMBOL_GPL(adxl34x_resume); EXPORT_SYMBOL_GPL(adxl34x_resume);
static ssize_t adxl34x_disable_show(struct device *dev, static ssize_t adxl34x_disable_show(struct device *dev,
...@@ -709,7 +708,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq, ...@@ -709,7 +708,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
input_dev = input_allocate_device(); input_dev = input_allocate_device();
if (!ac || !input_dev) { if (!ac || !input_dev) {
err = -ENOMEM; err = -ENOMEM;
goto err_out; goto err_free_mem;
} }
ac->fifo_delay = fifo_delay_default; ac->fifo_delay = fifo_delay_default;
...@@ -904,9 +903,9 @@ int adxl34x_remove(struct adxl34x *ac) ...@@ -904,9 +903,9 @@ int adxl34x_remove(struct adxl34x *ac)
sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group); sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group);
free_irq(ac->irq, ac); free_irq(ac->irq, ac);
input_unregister_device(ac->input); input_unregister_device(ac->input);
dev_dbg(ac->dev, "unregistered accelerometer\n");
kfree(ac); kfree(ac);
dev_dbg(ac->dev, "unregistered accelerometer\n");
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(adxl34x_remove); EXPORT_SYMBOL_GPL(adxl34x_remove);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment