Re: [PATCH v3 1/6] iio: accel: hid-sensor-accel-3d: Fix memory leak in probe()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, 2015-05-13 at 15:06 -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
> 
> 'channels' is allocated via kmemdup and it is never freed in the
> subsequent error paths.
> 
> Use 'indio_dev->channels' directly instead, so that we avoid such
> memory leak problem.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
> ---
> Build-tested only.
> 
> Changes since v2:
> - Properly align "accel_3d_parse_report(" in multiple lines
> Changes since v1:
> - Make clear in the commit log that the proble only occurs in the error
> paths
> 
>  drivers/iio/accel/hid-sensor-accel-3d.c | 13 ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
> index 2b4fad6..b933957 100644
> --- a/drivers/iio/accel/hid-sensor-accel-3d.c
> +++ b/drivers/iio/accel/hid-sensor-accel-3d.c
> @@ -299,7 +299,6 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
>  	struct iio_dev *indio_dev;
>  	struct accel_3d_state *accel_state;
>  	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
> -	struct iio_chan_spec *channels;
>  
>  	indio_dev = devm_iio_device_alloc(&pdev->dev,
>  					  sizeof(struct accel_3d_state));
> @@ -320,21 +319,21 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
>  		return ret;
>  	}
>  
> -	channels = kmemdup(accel_3d_channels, sizeof(accel_3d_channels),
> -			   GFP_KERNEL);
> -	if (!channels) {
> +	indio_dev->channels = kmemdup(accel_3d_channels,
> +				      sizeof(accel_3d_channels), GFP_KERNEL);
> +	if (!indio_dev->channels) {
>  		dev_err(&pdev->dev, "failed to duplicate channels\n");
>  		return -ENOMEM;
>  	}
>  
> -	ret = accel_3d_parse_report(pdev, hsdev, channels,
> -					HID_USAGE_SENSOR_ACCEL_3D, accel_state);
> +	ret = accel_3d_parse_report(pdev, hsdev,
> +				    (struct iio_chan_spec *)indio_dev->channels,
> +				    HID_USAGE_SENSOR_ACCEL_3D, accel_state);
>  	if (ret) {
>  		dev_err(&pdev->dev, "failed to setup attributes\n");
>  		goto error_free_dev_mem;
>  	}
>  
> -	indio_dev->channels = channels;
>  	indio_dev->num_channels = ARRAY_SIZE(accel_3d_channels);
>  	indio_dev->dev.parent = &pdev->dev;
>  	indio_dev->info = &accel_3d_info;


--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux