aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-02 07:01:24 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-02 07:01:24 +0000
commitb8b060d2fedcd8b89e8b7a4a76573973109c519e (patch)
treeb954413a4bc6df78d316c22a9d2519a45352ffc0
parent0a7a73261abed56a9a55a7f5a073d6f122c9ce27 (diff)
downloadupstream-b8b060d2fedcd8b89e8b7a4a76573973109c519e.tar.gz
upstream-b8b060d2fedcd8b89e8b7a4a76573973109c519e.tar.bz2
upstream-b8b060d2fedcd8b89e8b7a4a76573973109c519e.zip
broadcom-wl: fix memory corruption and leakage on remove (patch from #9576 by George Kashperko)
SVN-Revision: 27348
-rw-r--r--package/broadcom-wl/patches/006-fix-mem-leak-on-unload.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/package/broadcom-wl/patches/006-fix-mem-leak-on-unload.patch b/package/broadcom-wl/patches/006-fix-mem-leak-on-unload.patch
new file mode 100644
index 0000000000..41c246ff80
--- /dev/null
+++ b/package/broadcom-wl/patches/006-fix-mem-leak-on-unload.patch
@@ -0,0 +1,31 @@
+From: George Kashperko <george@znau.edu.ua>
+
+Release nvram variables buffer.
+Prevent block reserved by alloc_etherdev from being freed.
+Signed-off-by: George Kashperko <george@znau.edu.ua>
+---
+---
+--- a/driver/siutils.c
++++ b/driver/siutils.c
+@@ -647,7 +647,10 @@ si_detach(si_t *sih)
+ #if !defined(BCMBUSTYPE) || (BCMBUSTYPE == SI_BUS)
+ if (sii != &ksii)
+ #endif /* !BCMBUSTYPE || (BCMBUSTYPE == SI_BUS) */
+- MFREE(sii->osh, sii, sizeof(si_info_t));
++ do {
++ MFREE(sii->osh, sii, sizeof(si_info_t));
++ nvram_exit((void *)&(sii->pub));
++ } while (0);
+ }
+
+ void *
+--- a/driver/wl_linux.c
++++ b/driver/wl_linux.c
+@@ -1477,7 +1477,6 @@ wl_free_if(wl_info_t *wl, wl_if_t *wlif)
+ free_netdev(wlif->dev);
+ #endif
+ }
+- MFREE(wl->osh, wlif, sizeof(wl_if_t));
+ }
+
+ #ifdef AP