summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy@warmcat.com>2007-10-09 22:46:33 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-11-16 08:27:36 -0800
commitd876cd16fb5c5c98f1fd0c2cb8d5d1122de51ae8 (patch)
tree5291798739a9c3ab464ea980d3cb7fd240f27f69
parent1e3bfd1413e453b29517e72a9d8f16f22733a847 (diff)
Add get_unaligned to ieee80211_get_radiotap_len
patch dfe6e81deaa79c85086c0cc8d85b229e444ab97f in mainline. ieee80211_get_radiotap_len() tries to dereference radiotap length without taking care that it is completely unaligned and get_unaligned() is required. Signed-off-by: Andy Green <andy@warmcat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/mac80211/ieee80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 0c6c3c3b94af..9e0da6e8c443 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -350,7 +350,7 @@ static int ieee80211_get_radiotap_len(struct sk_buff *skb)
struct ieee80211_radiotap_header *hdr =
(struct ieee80211_radiotap_header *) skb->data;
- return le16_to_cpu(hdr->it_len);
+ return le16_to_cpu(get_unaligned(&hdr->it_len));
}
#ifdef CONFIG_MAC80211_LOWTX_FRAME_DUMP