aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-07-30 07:05:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-07-30 07:05:12 +0000
commit2da35aec10c800dfd3c0d2d95f04da619907c5b7 (patch)
tree36133534a521ea2ef486a47a26b9064ace00bd8d
parente910ed851b99d8532ee16b61c1ebb6a8f2638978 (diff)
downloadupstream-2da35aec10c800dfd3c0d2d95f04da619907c5b7.tar.gz
upstream-2da35aec10c800dfd3c0d2d95f04da619907c5b7.tar.bz2
upstream-2da35aec10c800dfd3c0d2d95f04da619907c5b7.zip
madwifi: add some extra sanity checking
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12006 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/madwifi/patches/373-sanity_check.patch12
-rw-r--r--package/madwifi/patches/405-retransmit_check.patch2
2 files changed, 13 insertions, 1 deletions
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) &&