OSDN Git Service

mac80211: strictly check mesh address extension mode
authorRajkumar Manoharan <rmanohar@qti.qualcomm.com>
Mon, 15 May 2017 04:41:55 +0000 (21:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 24 Jun 2017 05:11:13 +0000 (07:11 +0200)
commit6568f8f70152b787ded9fe9f7d88aaeac379b6d3
tree2ac35b84ca943057b65a2d3df2da7a68fa9245bb
parentc8143269c9c48172c832f25b5ae38163147244d2
mac80211: strictly check mesh address extension mode

commit 5667c86acf021e6dcf02584408b4484a273ac68f upstream.

Mesh forwarding path checks for address extension mode to fetch
appropriate proxied address and MPP address. Existing condition
that looks for 6 address format is not strict enough so that
frames with improper values are processed and invalid entries
are added into MPP table. Fix that by adding a stricter check before
processing the packet.

Per IEEE Std 802.11s-2011 spec. Table 7-6g1 lists address extension
mode 0x3 as reserved one. And also Table Table 9-13 does not specify
0x3 as valid address field.

Fixes: 9b395bc3be1c ("mac80211: verify that skb data is present")
Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/mac80211/rx.c
net/wireless/util.c