summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2009-07-10 16:42:29 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-21 12:07:38 -0400
commit8ef86c7bfac5b44529b73b84bc50d3cf574bfb4b (patch)
tree56e4b14e60fac4f53e81fc21abed0f2556604501 /net
parentf54c142725ad2ba33c3ee627873cb6966bf05447 (diff)
downloadlinux-8ef86c7bfac5b44529b73b84bc50d3cf574bfb4b.tar.bz2
mac80211: fix injection in monitor mode
The location of the 802.11 header is calculated incorrectly due to a wrong placement of parentheses. Found by kmemcheck. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d238a8939a09..3a8922cd1038 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1455,7 +1455,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
monitor_iface = UNKNOWN_ADDRESS;
len_rthdr = ieee80211_get_radiotap_len(skb->data);
- hdr = (struct ieee80211_hdr *)skb->data + len_rthdr;
+ hdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);
hdrlen = ieee80211_hdrlen(hdr->frame_control);
/* check the header is complete in the frame */