iio: orientation: hid-sensor-rotation: Fix memory leak in probe()
authorFabio Estevam <fabio.estevam@freescale.com>
Wed, 13 May 2015 18:06:13 +0000 (15:06 -0300)
committerJonathan Cameron <jic23@kernel.org>
Sun, 17 May 2015 08:10:25 +0000 (09:10 +0100)
'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>
drivers/iio/orientation/hid-sensor-rotation.c

index 603fe1419581f0bf3e307cfe62b3aaa46f04352b..b98b9d94d184cd058b7ddff7c40e7b9d87f965ac 100644 (file)
@@ -222,7 +222,6 @@ static int hid_dev_rot_probe(struct platform_device *pdev)
        struct iio_dev *indio_dev;
        struct dev_rot_state *rot_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 dev_rot_state));
@@ -243,21 +242,23 @@ static int hid_dev_rot_probe(struct platform_device *pdev)
                return ret;
        }
 
-       channels = devm_kmemdup(&pdev->dev, dev_rot_channels,
-                                       sizeof(dev_rot_channels), GFP_KERNEL);
-       if (!channels) {
+       indio_dev->channels = devm_kmemdup(&pdev->dev, dev_rot_channels,
+                                          sizeof(dev_rot_channels),
+                                          GFP_KERNEL);
+       if (!indio_dev->channels) {
                dev_err(&pdev->dev, "failed to duplicate channels\n");
                return -ENOMEM;
        }
 
-       ret = dev_rot_parse_report(pdev, hsdev, channels,
-                       HID_USAGE_SENSOR_DEVICE_ORIENTATION, rot_state);
+       ret = dev_rot_parse_report(pdev, hsdev,
+                                  (struct iio_chan_spec *)indio_dev->channels,
+                                  HID_USAGE_SENSOR_DEVICE_ORIENTATION,
+                                  rot_state);
        if (ret) {
                dev_err(&pdev->dev, "failed to setup attributes\n");
                return ret;
        }
 
-       indio_dev->channels = channels;
        indio_dev->num_channels = ARRAY_SIZE(dev_rot_channels);
        indio_dev->dev.parent = &pdev->dev;
        indio_dev->info = &dev_rot_info;
This page took 0.025072 seconds and 5 git commands to generate.