mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 11:19:37 +00:00
Code Issues Releases Wiki Activity

iio: gyro: hid-sensor-gyro-3d: Fix memory leak in probe()

Browse source 
'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>
This commit is contained in:
Fabio Estevam 2015-05-13 15:06:10 -03:00 committed by Jonathan Cameron
parent b136faff9b
commit d8c9d23e29
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/iio/gyro/hid-sensor-gyro-3d.c
View file

@ -298,7 +298,6 @@ static int hid_gyro_3d_probe(struct platform_device *pdev)
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct gyro_3d_state *gyro_state; struct gyro_3d_state *gyro_state;
struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
struct iio_chan_spec *channels;
indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gyro_state)); indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gyro_state));
if (!indio_dev) if (!indio_dev)
@ -317,21 +316,21 @@ static int hid_gyro_3d_probe(struct platform_device *pdev)
return ret; return ret;
} }
channels = kmemdup(gyro_3d_channels, sizeof(gyro_3d_channels), indio_dev->channels = kmemdup(gyro_3d_channels,
GFP_KERNEL); sizeof(gyro_3d_channels), GFP_KERNEL);
if (!channels) { if (!indio_dev->channels) {
dev_err(&pdev->dev, "failed to duplicate channels\n"); dev_err(&pdev->dev, "failed to duplicate channels\n");
return -ENOMEM; return -ENOMEM;
} }
ret = gyro_3d_parse_report(pdev, hsdev, channels, ret = gyro_3d_parse_report(pdev, hsdev,
HID_USAGE_SENSOR_GYRO_3D, gyro_state); (struct iio_chan_spec *)indio_dev->channels,
HID_USAGE_SENSOR_GYRO_3D, gyro_state);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to setup attributes\n"); dev_err(&pdev->dev, "failed to setup attributes\n");
goto error_free_dev_mem; goto error_free_dev_mem;
} }
indio_dev->channels = channels;
indio_dev->num_channels = ARRAY_SIZE(gyro_3d_channels); indio_dev->num_channels = ARRAY_SIZE(gyro_3d_channels);
indio_dev->dev.parent = &pdev->dev; indio_dev->dev.parent = &pdev->dev;
indio_dev->info = &gyro_3d_info; indio_dev->info = &gyro_3d_info;