Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1200073

[PATCH 3.12 003/123] iio: light: hid-sensor-als.c: Fix memory leak in probe()

Show all headers | View raw

From: Fabio Estevam <fabio.estevam@freescale.com>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit 9ecdbed7903921f29adae63a3155814b453e7186 upstream.

'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>
Cc: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/iio/light/hid-sensor-als.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index c104bda78c74..fe5441c543a3 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -239,7 +239,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)
@@ -257,20 +256,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;
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.12 000/123] 3.12.46-stable review Jiri Slaby <jslaby@suse.cz> - 2015-08-04 16:50 +0200
  [PATCH 3.12 001/123] mfd: cros_ec: cleanup: cros_ec.c is GPL licensed, like all the others. Jiri Slaby <jslaby@suse.cz> - 2015-08-04 17:30 +0200
    [PATCH 3.12 003/123] iio: light: hid-sensor-als.c: Fix memory leak in probe() Jiri Slaby <jslaby@suse.cz> - 2015-08-04 17:30 +0200
    [PATCH 3.12 009/123] ALSA: hda_intel: Add Device IDs for Intel Sunrise Point PCH Jiri Slaby <jslaby@suse.cz> - 2015-08-04 17:30 +0200
    [PATCH 3.12 010/123] ALSA: hda_intel: Add DeviceIDs for Sunrise Point-LP Jiri Slaby <jslaby@suse.cz> - 2015-08-04 17:30 +0200
    [PATCH 3.12 013/123] ALSA: hda_intel: apply the Seperate stream_tag for Skylake Jiri Slaby <jslaby@suse.cz> - 2015-08-04 17:30 +0200
  Re: [PATCH 3.12 000/123] 3.12.46-stable review Guenter Roeck <linux@roeck-us.net> - 2015-08-04 21:40 +0200
    Re: [PATCH 3.12 000/123] 3.12.46-stable review Jiri Slaby <jslaby@suse.cz> - 2015-08-05 09:30 +0200
  Re: [PATCH 3.12 000/123] 3.12.46-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2015-08-04 22:30 +0200

csiph-web