brcm47xx: fix memory leak, backport from the mainline kernel
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 29 Mar 2012 15:44:06 +0000 (15:44 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Thu, 29 Mar 2012 15:44:06 +0000 (15:44 +0000)
SVN-Revision: 31143

target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch [new file with mode: 0644]

diff --git a/target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch b/target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch
new file mode 100644 (file)
index 0000000..14d795e
--- /dev/null
@@ -0,0 +1,29 @@
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -458,15 +458,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 == -ENODEV) {
+-                      core_num++;
+-                      continue;
+-              } else if (err == -ENXIO)
+-                      continue;
+-              else if (err == -ESPIPE)
+-                      break;
+-              else if (err < 0)
++              if (err < 0) {
++                      kfree(core);
++                      if (err == -ENODEV) {
++                              core_num++;
++                              continue;
++                      } else if (err == -ENXIO) {
++                              continue;
++                      } else if (err == -ESPIPE) {
++                              break;
++                      }
+                       return err;
++              }
+               core->core_index = core_num++;
+               bus->nr_cores++;