Commit f9721ed2 authored by Jesper Juhl's avatar Jesper Juhl Committed by John W. Linville

bcma: Fix mem leak in bcma_bus_scan()

bcma_bus_scan() leaks 'struct bcma_device' bytes if
bcma_get_next_core() returns error.

Restructure the code so we always kfree() the memory we allocate to
the variable 'core' before it goes out of scope.
Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6f01fd6e
...@@ -399,15 +399,18 @@ int bcma_bus_scan(struct bcma_bus *bus) ...@@ -399,15 +399,18 @@ int bcma_bus_scan(struct bcma_bus *bus)
core->bus = bus; core->bus = bus;
err = bcma_get_next_core(bus, &eromptr, NULL, core_num, core); err = bcma_get_next_core(bus, &eromptr, NULL, core_num, core);
if (err == -ENODEV) { if (err < 0) {
core_num++; kfree(core);
continue; if (err == -ENODEV) {
} else if (err == -ENXIO) core_num++;
continue; continue;
else if (err == -ESPIPE) } else if (err == -ENXIO) {
break; continue;
else if (err < 0) } else if (err == -ESPIPE) {
break;
}
return err; return err;
}
core->core_index = core_num++; core->core_index = core_num++;
bus->nr_cores++; bus->nr_cores++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment