]> git.hungrycats.org Git - linux/commitdiff
iio: light: hid-sensor-als.c: Fix memory leak in probe()
authorFabio Estevam <fabio.estevam@freescale.com>
Wed, 13 May 2015 18:06:11 +0000 (15:06 -0300)
committerSasha Levin <sasha.levin@oracle.com>
Thu, 27 Aug 2015 17:26:02 +0000 (13:26 -0400)
[ Upstream commit 9ecdbed7903921f29adae63a3155814b453e7186 ]

'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/light/hid-sensor-als.c

index a5283d75c0961da4d1a8aea12c0e902a98af618f..9c44fe02e62e8406245ea6695946fb008a584ef1 100644 (file)
@@ -270,7 +270,6 @@ static int hid_als_probe(struct platform_device *pdev)
        struct iio_dev *indio_dev;
        struct als_state *als_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 als_state));
        if (!indio_dev)
@@ -288,20 +287,21 @@ static int hid_als_probe(struct platform_device *pdev)
                return ret;
        }
 
-       channels = kmemdup(als_channels, sizeof(als_channels), GFP_KERNEL);
-       if (!channels) {
+       indio_dev->channels = kmemdup(als_channels,
+                                     sizeof(als_channels), GFP_KERNEL);
+       if (!indio_dev->channels) {
                dev_err(&pdev->dev, "failed to duplicate channels\n");
                return -ENOMEM;
        }
 
-       ret = als_parse_report(pdev, hsdev, channels,
-                               HID_USAGE_SENSOR_ALS, als_state);
+       ret = als_parse_report(pdev, hsdev,
+                              (struct iio_chan_spec *)indio_dev->channels,
+                              HID_USAGE_SENSOR_ALS, als_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(als_channels);
        indio_dev->dev.parent = &pdev->dev;