]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MAC80211]: Add get_unaligned to ieee80211_get_radiotap_len
authorAndy Green <andy@warmcat.com>
Fri, 27 Jul 2007 13:43:24 +0000 (15:43 +0200)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:47:40 +0000 (16:47 -0700)
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: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
include/net/ieee80211_radiotap.h

index 22e047758ba12d12fe71853495aa568cd38e6397..dfd8bf66ce274f99e486cf80794980f255b398ae 100644 (file)
@@ -40,6 +40,7 @@
 
 #include <linux/if_ether.h>
 #include <linux/kernel.h>
+#include <asm/unaligned.h>
 
 /* Radiotap header version (from official NetBSD feed) */
 #define IEEE80211RADIOTAP_VERSION      "1.5"
@@ -261,7 +262,7 @@ static inline int ieee80211_get_radiotap_len(unsigned char *data)
        struct ieee80211_radiotap_header *hdr =
                (struct ieee80211_radiotap_header *)data;
 
-       return le16_to_cpu(hdr->it_len);
+       return le16_to_cpu(get_unaligned(&hdr->it_len));
 }
 
 #endif                         /* IEEE80211_RADIOTAP_H */