On 13/05/15 20:03, Srinivas Pandruvada wrote:
> On Wed, 2015-05-13 at 15:06 -0300, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
>>
>> '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@xxxxxxxxxxxxx>
> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
Applied to the togreg branch of iio.git - initially pushed out as testing.
Thanks.
>> ---
>> Build-tested only.
>>
>> Changes since v2:
>> - Properly align "press_parse_report(" in multiple lines
>> Changes since v1:
>> - Make clear in the commit log that the proble only occurs in the error
>> paths
>> drivers/iio/pressure/hid-sensor-press.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
>> index 7bb8d4c..5a10dbc 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)
>> struct iio_dev *indio_dev;
>> struct press_state *press_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 press_state));
>> @@ -282,20 +281,21 @@ static int hid_press_probe(struct platform_device *pdev)
>> return ret;
>> }
>>
>> - channels = kmemdup(press_channels, sizeof(press_channels), GFP_KERNEL);
>> - if (!channels) {
>> + indio_dev->channels = kmemdup(press_channels, sizeof(press_channels),
>> + GFP_KERNEL);
>> + if (!indio_dev->channels) {
>> dev_err(&pdev->dev, "failed to duplicate channels\n");
>> return -ENOMEM;
>> }
>>
>> - ret = press_parse_report(pdev, hsdev, channels,
>> - HID_USAGE_SENSOR_PRESSURE, press_state);
>> + ret = press_parse_report(pdev, hsdev,
>> + (struct iio_chan_spec *)indio_dev->channels,
>> + HID_USAGE_SENSOR_PRESSURE, press_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(press_channels);
>> indio_dev->dev.parent = &pdev->dev;
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
