From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 30 Jul 2008 07:05:12 +0000 (+0000)
Subject: madwifi: add some extra sanity checking
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=10b74a2455971310bf22d3d9c2127e4bc6f4225e;p=openwrt%2Fstaging%2Fnbd.git

madwifi: add some extra sanity checking

SVN-Revision: 12006
---

diff --git a/package/madwifi/patches/373-sanity_check.patch b/package/madwifi/patches/373-sanity_check.patch
new file mode 100644
index 0000000000..9c18a74148
--- /dev/null
+++ b/package/madwifi/patches/373-sanity_check.patch
@@ -0,0 +1,12 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -238,6 +238,9 @@
+ 	if (vap->iv_opmode == IEEE80211_M_MONITOR)
+ 		goto out;
+ 
++	if (!skb->data)
++		goto out;
++
+ 	if (skb->len < sizeof(struct ieee80211_frame_min)) {
+ 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
+ 			ni->ni_macaddr, NULL,
diff --git a/package/madwifi/patches/405-retransmit_check.patch b/package/madwifi/patches/405-retransmit_check.patch
index 633901433a..66db06175d 100644
--- a/package/madwifi/patches/405-retransmit_check.patch
+++ b/package/madwifi/patches/405-retransmit_check.patch
@@ -11,7 +11,7 @@
  #define	IEEE80211_QOS_TXOP			0x00ff
 --- a/net80211/ieee80211_input.c
 +++ b/net80211/ieee80211_input.c
-@@ -414,7 +414,7 @@
+@@ -417,7 +417,7 @@
  				tid = 0;
  			rxseq = le16toh(*(__le16 *)wh->i_seq);
  			if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) &&