Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12481cb5 authored by Markus Theil's avatar Markus Theil Committed by Bernhard Thoben
Browse files

nl80211: fix validation of mesh path nexthop 



commit 1fab1b89e2e8f01204a9c05a39fd0b6411a48593 upstream.

Mesh path nexthop should be a ethernet address, but current validation
checks against 4 byte integers.

Cc: stable@vger.kernel.org
Fixes: 2ec600d6 ("nl80211/cfg80211: support for mesh, sta dumping")
Signed-off-by: default avatarMarkus Theil <markus.theil@tu-ilmenau.de>
Link: https://lore.kernel.org/r/20191029093003.10355-1-markus.theil@tu-ilmenau.de


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Icf0b70552c0bef742854515bdd42ef2ecdb13413
parent b24a9d1c

net/wireless/nl80211.c

+2 −1
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = { 
	[NL80211_ATTR_MNTR_FLAGS] = { /* NLA_NESTED can't be empty */ },

	[NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY,

				   .len = IEEE80211_MAX_MESH_ID_LEN },

	[NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 },

	[NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_BINARY,

					  .len = ETH_ALEN },



	[NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 },

	[NL80211_ATTR_REG_RULES] = { .type = NLA_NESTED },