diff options
| author | Fabio Estevam | 2015-05-13 20:06:14 +0200 |
|---|---|---|
| committer | Jonathan Cameron | 2015-05-17 10:10:33 +0200 |
| commit | c24e7daf823256c83ce3efe6fa9b9b8ab5b78480 (patch) | |
| tree | e47a7700d2a5e1f59053362ca9fbe2c2f6039611 | |
| parent | iio: orientation: hid-sensor-rotation: Fix memory leak in probe() (diff) | |
| download | kernel-qcow2-linux-c24e7daf823256c83ce3efe6fa9b9b8ab5b78480.tar.gz kernel-qcow2-linux-c24e7daf823256c83ce3efe6fa9b9b8ab5b78480.tar.xz kernel-qcow2-linux-c24e7daf823256c83ce3efe6fa9b9b8ab5b78480.zip | |
iio: pressure: hid-sensor-press: Fix memory leak in probe()
'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>
| -rw-r--r-- | drivers/iio/pressure/hid-sensor-press.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c index f3305d80c0b8..c060bd847f54 100644 --- a/drivers/iio/pressure/hid-sensor-press.c +++ b/drivers/iio/pressure/hid-sensor-press.c @@ -262,7 +262,6 @@ static int hid_press_probe(struct platform_device *pdev) struct iio_dev *indio_dev; struct press_state *press_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 press_state)); @@ -282,20 +281,21 @@ static int hid_press_probe(struct platform_device *pdev) return ret; } - channels = kmemdup(press_channels, sizeof(press_channels), GFP_KERNEL); - if (!channels) { + indio_dev->channels = kmemdup(press_channels, sizeof(press_channels), + GFP_KERNEL); + if (!indio_dev->channels) { dev_err(&pdev->dev, "failed to duplicate channels\n"); return -ENOMEM; } - ret = press_parse_report(pdev, hsdev, channels, - HID_USAGE_SENSOR_PRESSURE, press_state); + ret = press_parse_report(pdev, hsdev, + (struct iio_chan_spec *)indio_dev->channels, + HID_USAGE_SENSOR_PRESSURE, press_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(press_channels); indio_dev->dev.parent = &pdev->dev; |