Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0828ba9 authored by Fabio Estevam's avatar Fabio Estevam Committed by Jonathan Cameron
Browse files

iio: light: hid-sensor-prox: Fix memory leak in probe() 



'channels' is allocated via kmemdup and it is never freed.

Use 'indio_dev->channels' directly instead, so that we avoid such
memory leak problem.

Reported-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent f29b212e

drivers/iio/light/hid-sensor-prox.c

+5 −5
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ static int hid_prox_probe(struct platform_device *pdev) 
	struct iio_dev *indio_dev;

	struct prox_state *prox_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 prox_state));
@@ -269,20 +268,21 @@ static int hid_prox_probe(struct platform_device *pdev) 
		return ret;

	}



	channels = kmemdup(prox_channels, sizeof(prox_channels), GFP_KERNEL);

	if (!channels) {

	indio_dev->channels = kmemdup(prox_channels, sizeof(prox_channels),

				      GFP_KERNEL);

	if (!indio_dev->channels) {

		dev_err(&pdev->dev, "failed to duplicate channels\n");

		return -ENOMEM;

	}



	ret = prox_parse_report(pdev, hsdev, channels,

	ret = prox_parse_report(pdev, hsdev,

				(struct iio_chan_spec *)indio_dev->channels,

				HID_USAGE_SENSOR_PROX, prox_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(prox_channels);

	indio_dev->dev.parent = &pdev->dev;