Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1579725

[PATCH 4.4 12/20] mac80211: Fix adding of mesh vendor IEs

Show all headers | View raw

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Thorsten Horstmann <thorsten@defutech.de>

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 net/mac80211/mesh.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -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)

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 4.4 00/20] 4.4.49-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:10 +0100
  [PATCH 4.4 16/20] scsi: mpt3sas: disable ASPM for MPI2 controllers Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:10 +0100
  [PATCH 4.4 13/20] [PATCH] netvsc: Set maximum GSO size in the right place Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:10 +0100
  [PATCH 4.4 01/20] ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:10 +0100
  [PATCH 4.4 19/20] ALSA: seq: Dont handle loop timeout at snd_seq_pool_done() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:10 +0100
  [PATCH 4.4 08/20] target: Use correct SCSI status during EXTENDED_COPY exception Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  [PATCH 4.4 12/20] mac80211: Fix adding of mesh vendor IEs Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  [PATCH 4.4 17/20] xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  [PATCH 4.4 11/20] ARM: 8642/1: LPAE: catch pending imprecise abort on unmask Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  [PATCH 4.4 04/20] cpumask: use nr_cpumask_bits for parsing functions Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  [PATCH 4.4 07/20] target: Dont BUG_ON during NodeACL dynamic -> explicit conversion Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  [PATCH 4.4 06/20] ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  [PATCH 4.4 02/20] selinux: fix off-by-one in setprocattr Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  [PATCH 4.4 09/20] target: Fix early transport_generic_handle_tmr abort scenario Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-13 14:20 +0100
  Re: [PATCH 4.4 00/20] 4.4.49-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-02-13 18:20 +0100
  Re: [PATCH 4.4 00/20] 4.4.49-stable review Guenter Roeck <linux@roeck-us.net> - 2017-02-13 21:10 +0100
  Re: [PATCH 4.4 00/20] 4.4.49-stable review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2017-02-15 12:50 +0100
    Re: [PATCH 4.4 00/20] 4.4.49-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-15 17:40 +0100

csiph-web