Skip to content

Commit b9c29d4

Browse files
Thorsten Horstmanngregkh
authored andcommitted
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: 082ebb0 ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2f46791 commit b9c29d4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/mac80211/mesh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ int mesh_add_vendor_ies(struct ieee80211_sub_if_data *sdata,
355355
/* fast-forward to vendor IEs */
356356
offset = ieee80211_ie_split_vendor(ifmsh->ie, ifmsh->ie_len, 0);
357357

358-
if (offset) {
358+
if (offset < ifmsh->ie_len) {
359359
len = ifmsh->ie_len - offset;
360360
data = ifmsh->ie + offset;
361361
if (skb_tailroom(skb) < len)

0 commit comments

Comments
 (0)