linux-kernel - Re: [PATCH v2] Input: soc_button_array: Remove kfree on data allocated with devm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMf-jSm1d0wAJ3C_yFhqnoDPSLqeDcc-ow0D=bwmLUcC9sXjLA@mail.gmail.com>
Date:	Mon, 28 Jul 2014 12:20:41 +0530
From:	pramod gurav <pramod.gurav.etc@...il.com>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	linux-input@...r.kernel.org,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Pramod Gurav <pramod.gurav@...rtplayin.com>,
	Lejun Zhu <lejun.zhu@...ux.intel.com>,
	Sachin Kamat <sachin.kamat@...aro.org>
Subject: Re: [PATCH v2] Input: soc_button_array: Remove kfree on data
 allocated with devm_zalloc

Hi Dmitry,

Thanks for the review.

On Fri, Jul 25, 2014 at 9:52 PM, Dmitry Torokhov
<dmitry.torokhov@...il.com> wrote:
> Hi Pramod,
>
> On Fri, Jul 25, 2014 at 05:04:34PM +0530, pramod.gurav.etc@...il.com wrote:
>> From: Pramod Gurav <pramod.gurav@...rtplayin.com>
>>
>> This patch does below:
>> - Removes kfree done on data allocated with devm_zalloc in probe
>>   path of the driver.
>> - Adds a check on return value from devm_kzalloc which was missing
>>
>> CC: Dmitry Torokhov <dmitry.torokhov@...il.com>
>> CC: Lejun Zhu <lejun.zhu@...ux.intel.com>
>> CC: Sachin Kamat <sachin.kamat@...aro.org>
>>
>> Signed-off-by: Pramod Gurav <pramod.gurav@...rtplayin.com>
>> ---
>>  drivers/input/misc/soc_button_array.c |   17 +++++++----------
>>  1 file changed, 7 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
>> index 5a6334b..fc64ec6 100644
>> --- a/drivers/input/misc/soc_button_array.c
>> +++ b/drivers/input/misc/soc_button_array.c
>> @@ -83,6 +83,9 @@ soc_button_device_create(struct pnp_dev *pdev,
>>                                      sizeof(*gpio_keys_pdata) +
>>                                       sizeof(*gpio_keys) * MAX_NBUTTONS,
>>                                      GFP_KERNEL);
>> +     if (!gpio_keys_pdata)
>> +             return ERR_PTR(-ENOMEM);
>
> OK, that makes sense.
>
>> +
>>       gpio_keys = (void *)(gpio_keys_pdata + 1);
>>
>>       for (info = button_info; info->name; info++) {
>> @@ -102,20 +105,16 @@ soc_button_device_create(struct pnp_dev *pdev,
>>               n_buttons++;
>>       }
>>
>> -     if (n_buttons == 0) {
>> -             error = -ENODEV;
>> -             goto err_free_mem;
>> -     }
>> +     if (n_buttons == 0)
>> +             return ERR_PTR(-ENODEV);
>
> But that one and the rest don't, because failure in
> soc_button_device_create() does not necessarily mean that binding for
> the whole device will fail. In this case we do not want unused memory
> hang around.
Agree. Should resend the patch with only the error check after mem
allocation and will be little more careful while sending any such
change. :)

>
> Thanks.
>
> --
> Dmitry



-- 
Thanks and Regards
Pramod
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/