Skip to contentSkip to conversation

Patch "mac80211: Fix adding of mesh vendor IEs" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Feb 10, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mac80211: Fix adding of mesh vendor IEs

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     mac80211-fix-adding-of-mesh-vendor-ies.patch

and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From da7061c82e4a1bc6a5e134ef362c86261906c860 Mon Sep 17 00:00:00 2001

From: Thorsten Horstmann <[email protected]>
Date: Fri, 3 Feb 2017 14:38:29 +0100
Subject: mac80211: Fix adding of mesh vendor IEs

From: Thorsten Horstmann <[email protected]>

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")
[[email protected]: Add commit message]
---
 net/mac80211/mesh.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mesh.c +1 -1
@@ -355,7 +355,7 @@ int mesh_add_vendor_ies(struct ieee80211
 	/* fast-forward to vendor IEs */
 	offset = ieee80211_ie_split_vendor(ifmsh->ie, ifmsh->ie_len, 0);
 
-	if (offset) {
+	if (offset < ifmsh->ie_len) {
 		len = ifmsh->ie_len - offset;
 		data = ifmsh->ie + offset;
 		if (skb_tailroom(skb) < len)

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/mac80211-fix-adding-of-mesh-vendor-ies.patch