aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/pressure
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-05-13 14:06:14 -0400
committerJonathan Cameron <jic23@kernel.org>2015-05-17 04:10:33 -0400
commitc24e7daf823256c83ce3efe6fa9b9b8ab5b78480 (patch)
treee47a7700d2a5e1f59053362ca9fbe2c2f6039611 /drivers/iio/pressure
parent2bd04628435ff57a2fefa71e7d3e5c005db5c978 (diff)
iio: pressure: hid-sensor-press: Fix memory leak in probe()
'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>
Diffstat (limited to 'drivers/iio/pressure')
-rw-r--r--drivers/iio/pressure/hid-sensor-press.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index f3305d80c0b8..c060bd847f54 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -262,7 +262,6 @@ static int hid_press_probe(struct platform_device *pdev)
262 struct iio_dev *indio_dev; 262 struct iio_dev *indio_dev;
263 struct press_state *press_state; 263 struct press_state *press_state;
264 struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; 264 struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
265 struct iio_chan_spec *channels;
266 265
267 indio_dev = devm_iio_device_alloc(&pdev->dev, 266 indio_dev = devm_iio_device_alloc(&pdev->dev,
268 sizeof(struct press_state)); 267 sizeof(struct press_state));
@@ -282,20 +281,21 @@ static int hid_press_probe(struct platform_device *pdev)
282 return ret; 281 return ret;
283 } 282 }
284 283
285 channels = kmemdup(press_channels, sizeof(press_channels), GFP_KERNEL); 284 indio_dev->channels = kmemdup(press_channels, sizeof(press_channels),
286 if (!channels) { 285 GFP_KERNEL);
286 if (!indio_dev->channels) {
287 dev_err(&pdev->dev, "failed to duplicate channels\n"); 287 dev_err(&pdev->dev, "failed to duplicate channels\n");
288 return -ENOMEM; 288 return -ENOMEM;
289 } 289 }
290 290
291 ret = press_parse_report(pdev, hsdev, channels, 291 ret = press_parse_report(pdev, hsdev,
292 HID_USAGE_SENSOR_PRESSURE, press_state); 292 (struct iio_chan_spec *)indio_dev->channels,
293 HID_USAGE_SENSOR_PRESSURE, press_state);
293 if (ret) { 294 if (ret) {
294 dev_err(&pdev->dev, "failed to setup attributes\n"); 295 dev_err(&pdev->dev, "failed to setup attributes\n");
295 goto error_free_dev_mem; 296 goto error_free_dev_mem;
296 } 297 }
297 298
298 indio_dev->channels = channels;
299 indio_dev->num_channels = 299 indio_dev->num_channels =
300 ARRAY_SIZE(press_channels); 300 ARRAY_SIZE(press_channels);
301 indio_dev->dev.parent = &pdev->dev; 301 indio_dev->dev.parent = &pdev->dev;