linux-kernel - Re: [PATCH] edd: fix possible memory leak in edd

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <AANLkTik3qDmpRS9HwFFzCfyHMrUd9ZnaR1A39jUo0cbt@mail.gmail.com>
Date:	Tue, 13 Jul 2010 09:17:58 +0800
From:	Axel Lin <axel.lin@...il.com>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-kernel <linux-kernel@...r.kernel.org>,
	Stephen Hemminger <shemminger@...tta.com>,
	Jens Axboe <jens.axboe@...cle.com>,
	David Teigland <teigland@...hat.com>,
	Pekka Enberg <penberg@...helsinki.fi>,
	"Hans J. Koch" <hjk@...utronix.de>
Subject: Re: [PATCH] edd: fix possible memory leak in edd_init() error path

2010/7/13 Andrew Morton <akpm@...ux-foundation.org>:
> On Fri, 09 Jul 2010 18:50:07 +0800
> Axel Lin <axel.lin@...il.com> wrote:
>
>> The error may happen at any iteration of the for loop,
>> this patch properly unregisters already registed edd_devices in error path.
>>
>> Signed-off-by: Axel Lin <axel.lin@...il.com>
>> ---
>>  drivers/firmware/edd.c |   23 ++++++++++++++++-------
>>  1 files changed, 16 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
>> index 110e24e..b75082c 100644
>> --- a/drivers/firmware/edd.c
>> +++ b/drivers/firmware/edd.c
>> @@ -744,7 +744,7 @@ static inline int edd_num_devices(void)
>>  static int __init
>>  edd_init(void)
>>  {
>> -     unsigned int i;
>> +     int i;
>>       int rc=0;
>>       struct edd_device *edev;
>>
>> @@ -760,21 +760,30 @@ edd_init(void)
>>       if (!edd_kset)
>>               return -ENOMEM;
>>
>> -     for (i = 0; i < edd_num_devices() && !rc; i++) {
>> +     for (i = 0; i < edd_num_devices(); i++) {
>>               edev = kzalloc(sizeof (*edev), GFP_KERNEL);
>> -             if (!edev)
>> -                     return -ENOMEM;
>> +             if (!edev) {
>> +                     rc = -ENOMEM;
>> +                     goto out;
>> +             }
>>
>>               rc = edd_device_register(edev, i);
>>               if (rc) {
>>                       kfree(edev);
>> -                     break;
>> +                     goto out;
>>               }
>>               edd_devices[i] = edev;
>>       }
>>
>> -     if (rc)
>> -             kset_unregister(edd_kset);
>> +     return 0;
>> +
>> +out:
>> +     while (--i >= 0) {
>> +             edev = edd_devices[i];
>> +             if (edev)
>
> This test is unneeded?

right. a revised version is on the way.

Regards,
Axel

>
>> +                     edd_device_unregister(edev);
>> +     }
>> +     kset_unregister(edd_kset);
>>       return rc;
>>  }
>
>
--
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/