Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752191AbbEFWO3 (ORCPT ); Wed, 6 May 2015 18:14:29 -0400 Received: from mail.ispras.ru ([83.149.199.45]:48901 "EHLO mail.ispras.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbbEFWO0 (ORCPT ); Wed, 6 May 2015 18:14:26 -0400 Message-ID: <554A923F.2040205@ispras.ru> Date: Thu, 07 May 2015 01:14:23 +0300 From: Alexey Khoroshilov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Fabio Estevam CC: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald , linux-iio@vger.kernel.org, linux-kernel , ldv-project@linuxtesting.org Subject: Re: [PATCH] iio: hid-sensors: Fix memory leak on failure path in hid_prox_probe() References: <1430948924-4756-1-git-send-email-khoroshilov@ispras.ru> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1687 Lines: 47 On 07.05.2015 01:00, Fabio Estevam wrote: > On Wed, May 6, 2015 at 6:48 PM, Alexey Khoroshilov > wrote: >> If prox_parse_report() fails, memory allocated for channels is not >> deallocated, since it is still in local variable channels >> while kfree() is called with indio_dev->channels. >> >> Found by Linux Driver Verification project (linuxtesting.org). >> >> Signed-off-by: Alexey Khoroshilov >> --- >> drivers/iio/light/hid-sensor-prox.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c >> index 91ecc46ffeaa..d0d188108a11 100644 >> --- a/drivers/iio/light/hid-sensor-prox.c >> +++ b/drivers/iio/light/hid-sensor-prox.c >> @@ -281,8 +281,9 @@ static int hid_prox_probe(struct platform_device *pdev) >> ret = prox_parse_report(pdev, hsdev, channels, >> HID_USAGE_SENSOR_PROX, prox_state); >> if (ret) { >> + kfree(channels); >> dev_err(&pdev->dev, "failed to setup attributes\n"); >> - goto error_free_dev_mem; >> + return ret; > > Then the other calls to error_free_dev_mem will also miss to call > 'kfree(channels)'. > Not exactly. Other calls are after indio_dev->channels = channels; So, error_free_dev_mem: kfree(indio_dev->channels); works for them well. -- Alexey -- 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/