Re: [patch -next] input: adxl34x: fix leak and use after free

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

On Thu, Jul 22, 2010 at 10:55:52AM +0200, Dan Carpenter wrote:
> 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>
> 

Applied, thanks Dan.

> diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
> index bb9c10f..e925d12 100644
> --- a/drivers/input/misc/adxl34x.c
> +++ b/drivers/input/misc/adxl34x.c
> @@ -709,7 +709,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 +904,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);

-- 
Dmitry