diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-03-29 15:44:06 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-03-29 15:44:06 +0000 |
| commit | 88b3c3aad1f846b3217249f41da7d6e7be8c950d (patch) | |
| tree | 290f578f233aa0a64a7f8e1bc4ba4ebc1f16c0e3 /target/linux/brcm47xx | |
| parent | e0329692de29293241bda46b595b67b392186df9 (diff) | |
| download | upstream-88b3c3aad1f846b3217249f41da7d6e7be8c950d.tar.gz upstream-88b3c3aad1f846b3217249f41da7d6e7be8c950d.tar.bz2 upstream-88b3c3aad1f846b3217249f41da7d6e7be8c950d.zip | |
brcm47xx: fix memory leak, backport from the mainline kernel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31143 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch | 29 |
1 files changed, 29 insertions, 0 deletions
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 index 0000000000..14d795e706 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch @@ -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++; |