aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/ieee80211_radiotap.h
diff options
context:
space:
mode:
authorAndy Green <andy@warmcat.com>2007-07-27 09:43:24 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:47:40 -0400
commitdfe6e81deaa79c85086c0cc8d85b229e444ab97f (patch)
tree42a137b7642c6faec8a505d16186f3b65b2e2d8d /include/net/ieee80211_radiotap.h
parent0ec0b7ac3cdfb8635d75aead5733f7a424ea4ad3 (diff)
[MAC80211]: Add get_unaligned to ieee80211_get_radiotap_len
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>
Diffstat (limited to 'include/net/ieee80211_radiotap.h')
-rw-r--r--include/net/ieee80211_radiotap.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 22e047758ba1..dfd8bf66ce27 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -40,6 +40,7 @@
40 40
41#include <linux/if_ether.h> 41#include <linux/if_ether.h>
42#include <linux/kernel.h> 42#include <linux/kernel.h>
43#include <asm/unaligned.h>
43 44
44/* Radiotap header version (from official NetBSD feed) */ 45/* Radiotap header version (from official NetBSD feed) */
45#define IEEE80211RADIOTAP_VERSION "1.5" 46#define IEEE80211RADIOTAP_VERSION "1.5"
@@ -261,7 +262,7 @@ static inline int ieee80211_get_radiotap_len(unsigned char *data)
261 struct ieee80211_radiotap_header *hdr = 262 struct ieee80211_radiotap_header *hdr =
262 (struct ieee80211_radiotap_header *)data; 263 (struct ieee80211_radiotap_header *)data;
263 264
264 return le16_to_cpu(hdr->it_len); 265 return le16_to_cpu(get_unaligned(&hdr->it_len));
265} 266}
266 267
267#endif /* IEEE80211_RADIOTAP_H */ 268#endif /* IEEE80211_RADIOTAP_H */