bcma: Fix mem leak in bcma_bus_scan() (f9721ed2) · Commits · 戴 / test

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:

Jesper Juhl <jj@chaosbits.net> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

drivers/bcma/scan.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -399,15 +399,18 @@ int bcma_bus_scan(struct bcma_bus *bus)
		core->bus = bus;

		err = bcma_get_next_core(bus, &eromptr, NULL, core_num, core);
		if (err < 0) {
		kfree(core);
		if (err == -ENODEV) {
		core_num++;
		continue;
		} else if (err == -ENXIO)
		} else if (err == -ENXIO) {
		continue;
		else if (err == -ESPIPE)
		} else if (err == -ESPIPE) {
		break;
		else if (err < 0)
		}
		return err;
		}

		core->core_index = core_num++;
		bus->nr_cores++;

Admin message