Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752270AbbEGHnn (ORCPT ); Thu, 7 May 2015 03:43:43 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:34753 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752238AbbEGHnl (ORCPT ); Thu, 7 May 2015 03:43:41 -0400 MIME-Version: 1.0 In-Reply-To: References: <1430948924-4756-1-git-send-email-khoroshilov@ispras.ru> Date: Thu, 7 May 2015 10:43:40 +0300 X-Google-Sender-Auth: MUKlvlEWXd5bUhD-maSKb_JtFEw Message-ID: Subject: Re: [PATCH] iio: hid-sensors: Fix memory leak on failure path in hid_prox_probe() From: Daniel Baluta To: Fabio Estevam Cc: Alexey Khoroshilov , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald , "linux-iio@vger.kernel.org" , linux-kernel , ldv-project@linuxtesting.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2058 Lines: 54 On Thu, May 7, 2015 at 1:00 AM, 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)'. > > What about this fix instead? > > --- a/drivers/iio/light/hid-sensor-prox.c > +++ b/drivers/iio/light/hid-sensor-prox.c > @@ -332,7 +332,7 @@ error_remove_trigger: > error_unreg_buffer_funcs: > iio_triggered_buffer_cleanup(indio_dev); > error_free_dev_mem: > - kfree(indio_dev->channels); > + kfree(channels); > return ret; > } Both patches are correct and I think we should go with Fabio's version since it's consistent with the rest of the code. thanks, Daniel. -- 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/