Skip to content

Commit

Permalink
iio: light: hid-sensor-prox: Fix memory leak in probe()
Browse files Browse the repository at this point in the history
'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: Alexey Khoroshilov <[email protected]>
Signed-off-by: Fabio Estevam <[email protected]>
Reviewed-by: Srinivas Pandruvada <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>
  • Loading branch information
Fabio Estevam authored and jic23 committed May 12, 2015
1 parent f29b212 commit f0828ba
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/iio/light/hid-sensor-prox.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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;
Expand Down

0 comments on commit f0828ba

Please sign in to comment.