Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ca8e343 authored by Fabio Estevam's avatar Fabio Estevam Committed by Sasha Levin
Browse files

iio: gyro: hid-sensor-gyro-3d: Fix memory leak in probe() 



[ Upstream commit d8c9d23e29e3d758ea477adaa95e28cbf3556518 ]

'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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent a9ca142c

drivers/iio/gyro/hid-sensor-gyro-3d.c

+6 −7
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ static int hid_gyro_3d_probe(struct platform_device *pdev) 
	struct iio_dev *indio_dev;

	struct gyro_3d_state *gyro_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(*gyro_state));

	if (!indio_dev)
@@ -323,21 +322,21 @@ static int hid_gyro_3d_probe(struct platform_device *pdev) 
		return ret;

	}



	channels = kmemdup(gyro_3d_channels, sizeof(gyro_3d_channels),

			   GFP_KERNEL);

	if (!channels) {

	indio_dev->channels = kmemdup(gyro_3d_channels,

				      sizeof(gyro_3d_channels), GFP_KERNEL);

	if (!indio_dev->channels) {

		dev_err(&pdev->dev, "failed to duplicate channels\n");

		return -ENOMEM;

	}



	ret = gyro_3d_parse_report(pdev, hsdev, channels,

	ret = gyro_3d_parse_report(pdev, hsdev,

				   (struct iio_chan_spec *)indio_dev->channels,

				   HID_USAGE_SENSOR_GYRO_3D, gyro_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(gyro_3d_channels);

	indio_dev->dev.parent = &pdev->dev;

	indio_dev->info = &gyro_3d_info;