diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-07-22 23:38:45 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-07-22 23:39:16 -0700 |
| commit | f1cba532e8c1001a39650379aa7e04ad974d0592 (patch) | |
| tree | 9c663e053d1a9c35d260de1b00a141e6b9dd073f /drivers/input/misc | |
| parent | 0fffed27f92d9d7a34de9fe017b7082b5958bb93 (diff) | |
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: Dan Carpenter <error27@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/adxl34x.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c index bb9c10f9dfd..e2ca0170808 100644 --- a/drivers/input/misc/adxl34x.c +++ b/drivers/input/misc/adxl34x.c @@ -432,11 +432,10 @@ void adxl34x_resume(struct adxl34x *ac) if (ac->suspended && !ac->disabled && ac->opened) __adxl34x_enable(ac); - ac->suspended= false; + ac->suspended = false; mutex_unlock(&ac->mutex); } - EXPORT_SYMBOL_GPL(adxl34x_resume); static ssize_t adxl34x_disable_show(struct device *dev, @@ -709,7 +708,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq, input_dev = input_allocate_device(); if (!ac || !input_dev) { err = -ENOMEM; - goto err_out; + goto err_free_mem; } ac->fifo_delay = fifo_delay_default; @@ -904,9 +903,9 @@ int adxl34x_remove(struct adxl34x *ac) sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group); free_irq(ac->irq, ac); input_unregister_device(ac->input); + dev_dbg(ac->dev, "unregistered accelerometer\n"); kfree(ac); - dev_dbg(ac->dev, "unregistered accelerometer\n"); return 0; } EXPORT_SYMBOL_GPL(adxl34x_remove); |