redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

edd: fix possible memory leak in edd_init() error path 

The error may happen at any iteration of the for loop, this patch properly
unregisters already registed edd_devices in error path.

[akpm@linux-foundation.org: remove unneeded NULL test]
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
hifive-unleashed-5.1
Axel Lin 2010-08-09 17:20:56 -07:00 committed by Linus Torvalds
parent ea98eed9bc
commit 1986aaf828
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/firmware/edd.c
View File

@ -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,27 @@ 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)
edd_device_unregister(edd_devices[i]);
kset_unregister(edd_kset);
return rc;
}