]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: gyro: hid-sensor-gyro-3d: Fix memory leak in probe()
authorFabio Estevam <fabio.estevam@freescale.com>
Wed, 13 May 2015 18:06:10 +0000 (15:06 -0300)
committerSasha Levin <sasha.levin@oracle.com>
Thu, 27 Aug 2015 17:26:03 +0000 (13:26 -0400)
[ Upstream commit d8c9d23e29e3d758ea477adaa95e28cbf3556518 ]

'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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/iio/gyro/hid-sensor-gyro-3d.c

index a3ea1e8785d748c3f5afe63f62447589cd849c5b..c23c36bf99b5378b2ab23169921f91d608d2264a 100644 (file)
@@ -304,7 +304,6 @@ static int hid_gyro_3d_probe(struct platform_device *pdev)
        struct iio_dev *indio_dev;
        struct gyro_3d_state *gyro_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(*gyro_state));
        if (!indio_dev)
@@ -323,21 +322,21 @@ static int hid_gyro_3d_probe(struct platform_device *pdev)
                return ret;
        }
 
-       channels = kmemdup(gyro_3d_channels, sizeof(gyro_3d_channels),
-                          GFP_KERNEL);
-       if (!channels) {
+       indio_dev->channels = kmemdup(gyro_3d_channels,
+                                     sizeof(gyro_3d_channels), GFP_KERNEL);
+       if (!indio_dev->channels) {
                dev_err(&pdev->dev, "failed to duplicate channels\n");
                return -ENOMEM;
        }
 
-       ret = gyro_3d_parse_report(pdev, hsdev, channels,
-                                       HID_USAGE_SENSOR_GYRO_3D, gyro_state);
+       ret = gyro_3d_parse_report(pdev, hsdev,
+                                  (struct iio_chan_spec *)indio_dev->channels,
+                                  HID_USAGE_SENSOR_GYRO_3D, gyro_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(gyro_3d_channels);
        indio_dev->dev.parent = &pdev->dev;
        indio_dev->info = &gyro_3d_info;