]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
mac80211: Fix adding of mesh vendor IEs
authorThorsten Horstmann <thorsten@defutech.de>
Fri, 3 Feb 2017 13:38:29 +0000 (14:38 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 16 Feb 2017 10:44:44 +0000 (11:44 +0100)
commita9f239abb655cb97274963709253553c57eeb411
treeb02f731b5404d7f5c078499f6572fb28a824fd89
parent3193b44951ab3aa0d33e5277cc9961ff9cb67b2e
mac80211: Fix adding of mesh vendor IEs

commit da7061c82e4a1bc6a5e134ef362c86261906c860 upstream.

The function ieee80211_ie_split_vendor doesn't return 0 on errors. Instead
it returns any offset < ielen when WLAN_EID_VENDOR_SPECIFIC is found. The
return value in mesh_add_vendor_ies must therefore be checked against
ifmsh->ie_len and not 0. Otherwise all ifmsh->ie starting with
WLAN_EID_VENDOR_SPECIFIC will be rejected.

Fixes: 082ebb0c258d ("mac80211: fix mesh beacon format")
Signed-off-by: Thorsten Horstmann <thorsten@defutech.de>
Signed-off-by: Mathias Kretschmer <mathias.kretschmer@fit.fraunhofer.de>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
[sven@narfation.org: Add commit message]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
net/mac80211/mesh.c