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
commit0465f5e4ff5f7e1fca9ac8e0e142a20a72c96204 (patch)
tree3d6a69c963875410cc1b3e21a86348b15b985faf
parent52d27d6a85ddbb43804f5cb80fed9bd782664978 (diff)
downloadupstream-0465f5e4ff5f7e1fca9ac8e0e142a20a72c96204.tar.gz
upstream-0465f5e4ff5f7e1fca9ac8e0e142a20a72c96204.tar.bz2
upstream-0465f5e4ff5f7e1fca9ac8e0e142a20a72c96204.zip
broadcom-wl: fix memory corruption and leakage on remove (patch from #9576 by George Kashperko)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27348 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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