diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-05-13 15:06:11 -0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-07-30 14:10:59 +0200 |
| commit | e9c7313ab3c0f1ebe1f6aa6740c69f1a2d89d445 (patch) | |
| tree | 02b5e994fbcd1cc5a046d64b9394c9e51b516619 /drivers/iio | |
| parent | 7562c6fb07eadc6d0d9b6643dadad3d20af4d867 (diff) | |
| download | lwn-e9c7313ab3c0f1ebe1f6aa6740c69f1a2d89d445.tar.gz lwn-e9c7313ab3c0f1ebe1f6aa6740c69f1a2d89d445.zip | |
iio: light: hid-sensor-als.c: Fix memory leak in probe()
commit 9ecdbed7903921f29adae63a3155814b453e7186 upstream.
'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@freescale.com>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Cc: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/light/hid-sensor-als.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c index c104bda78c74..fe5441c543a3 100644 --- a/drivers/iio/light/hid-sensor-als.c +++ b/drivers/iio/light/hid-sensor-als.c @@ -239,7 +239,6 @@ static int hid_als_probe(struct platform_device *pdev) struct iio_dev *indio_dev; struct als_state *als_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 als_state)); if (!indio_dev) @@ -257,20 +256,21 @@ static int hid_als_probe(struct platform_device *pdev) return ret; } - channels = kmemdup(als_channels, sizeof(als_channels), GFP_KERNEL); - if (!channels) { + indio_dev->channels = kmemdup(als_channels, + sizeof(als_channels), GFP_KERNEL); + if (!indio_dev->channels) { dev_err(&pdev->dev, "failed to duplicate channels\n"); return -ENOMEM; } - ret = als_parse_report(pdev, hsdev, channels, - HID_USAGE_SENSOR_ALS, als_state); + ret = als_parse_report(pdev, hsdev, + (struct iio_chan_spec *)indio_dev->channels, + HID_USAGE_SENSOR_ALS, als_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(als_channels); indio_dev->dev.parent = &pdev->dev; |