All of lore.kernel.org
 help / color / mirror / Atom feed
From: Fabio Estevam <festevam@gmail.com>
To: jic23@kernel.org
Cc: srinivas.pandruvada@linux.intel.com, linux-iio@vger.kernel.org,
	Fabio Estevam <fabio.estevam@freescale.com>
Subject: [PATCH v3 4/6] iio: orientation: hid-sensor-incl-3d: Fix memory leak in probe()
Date: Wed, 13 May 2015 15:06:12 -0300	[thread overview]
Message-ID: <1431540374-3168-4-git-send-email-festevam@gmail.com> (raw)
In-Reply-To: <1431540374-3168-1-git-send-email-festevam@gmail.com>

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

'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>
---
Build-tested only.

Changes since v2:
- None
Changes since v1:
- Make clear in the commit log that the proble only occurs in the error
paths

 drivers/iio/orientation/hid-sensor-incl-3d.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/iio/orientation/hid-sensor-incl-3d.c b/drivers/iio/orientation/hid-sensor-incl-3d.c
index 5930fa3..2eb49a8 100644
--- a/drivers/iio/orientation/hid-sensor-incl-3d.c
+++ b/drivers/iio/orientation/hid-sensor-incl-3d.c
@@ -315,7 +315,6 @@ static int hid_incl_3d_probe(struct platform_device *pdev)
 	struct iio_dev *indio_dev;
 	struct incl_3d_state *incl_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 incl_3d_state));
@@ -336,21 +335,22 @@ static int hid_incl_3d_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	channels = kmemdup(incl_3d_channels, sizeof(incl_3d_channels),
-			   GFP_KERNEL);
-	if (!channels) {
+	indio_dev->channels = kmemdup(incl_3d_channels,
+				      sizeof(incl_3d_channels), GFP_KERNEL);
+	if (!indio_dev->channels) {
 		dev_err(&pdev->dev, "failed to duplicate channels\n");
 		return -ENOMEM;
 	}
 
-	ret = incl_3d_parse_report(pdev, hsdev, channels,
-				HID_USAGE_SENSOR_INCLINOMETER_3D, incl_state);
+	ret = incl_3d_parse_report(pdev, hsdev,
+				   (struct iio_chan_spec *)indio_dev->channels,
+				   HID_USAGE_SENSOR_INCLINOMETER_3D,
+				   incl_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(incl_3d_channels);
 	indio_dev->dev.parent = &pdev->dev;
 	indio_dev->info = &incl_3d_info;
-- 
1.9.1


  parent reply	other threads:[~2015-05-13 18:06 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-13 18:06 [PATCH v3 1/6] iio: accel: hid-sensor-accel-3d: Fix memory leak in probe() Fabio Estevam
2015-05-13 18:06 ` [PATCH v3 2/6] iio: gyro: hid-sensor-gyro-3d: " Fabio Estevam
2015-05-13 18:52   ` Srinivas Pandruvada
2015-05-17  8:10     ` Jonathan Cameron
2015-05-13 18:06 ` [PATCH v3 3/6] iio: light: hid-sensor-als.c: " Fabio Estevam
2015-05-13 18:52   ` Srinivas Pandruvada
2015-05-17  8:11     ` Jonathan Cameron
2015-05-13 18:06 ` Fabio Estevam [this message]
2015-05-13 18:54   ` [PATCH v3 4/6] iio: orientation: hid-sensor-incl-3d: " Srinivas Pandruvada
2015-05-17  8:11     ` Jonathan Cameron
2015-05-13 18:06 ` [PATCH v3 5/6] iio: orientation: hid-sensor-rotation: " Fabio Estevam
2015-05-13 19:03   ` Srinivas Pandruvada
2015-05-17  8:11     ` Jonathan Cameron
2015-05-13 18:06 ` [PATCH v3 6/6] iio: pressure: hid-sensor-press: " Fabio Estevam
2015-05-13 19:03   ` Srinivas Pandruvada
2015-05-17  8:11     ` Jonathan Cameron
2015-05-13 18:51 ` [PATCH v3 1/6] iio: accel: hid-sensor-accel-3d: " Srinivas Pandruvada
2015-05-17  8:09   ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431540374-3168-4-git-send-email-festevam@gmail.com \
    --to=festevam@gmail.com \
    --cc=fabio.estevam@freescale.com \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=srinivas.pandruvada@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.