Commit 174dad40 authored by Johannes Berg's avatar Johannes Berg Committed by sanglipeng1
Browse files

wifi: nl80211: reject iftype change with mesh ID change 

stable inclusion
from stable-v5.10.212
commit 99eb2159680af8786104dac80528acd5acd45980
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAGOP2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=99eb2159680af8786104dac80528acd5acd45980



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

commit f78c1375339a291cba492a70eaf12ec501d28a8e upstream.

It's currently possible to change the mesh ID when the
interface isn't yet in mesh mode, at the same time as
changing it into mesh mode. This leads to an overwrite
of data in the wdev->u union for the interface type it
currently has, causing cfg80211_change_iface() to do
wrong things when switching.

We could probably allow setting an interface to mesh
while setting the mesh ID at the same time by doing a
different order of operations here, but realistically
there's no userspace that's going to do this, so just
disallow changes in iftype when setting mesh ID.

Cc: stable@vger.kernel.org
Fixes: 29cbe68c ("cfg80211/mac80211: add mesh join/leave commands")
Reported-by: default avatar <syzbot+dd4779978217b1973180@syzkaller.appspotmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 0749ab92

net/wireless/nl80211.c

+2 −0
Original line number Diff line number Diff line
@@ -3772,6 +3772,8 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info) 


		if (ntype != NL80211_IFTYPE_MESH_POINT)

			return -EINVAL;

		if (otype != NL80211_IFTYPE_MESH_POINT)

			return -EINVAL;

		if (netif_running(dev))

			return -EBUSY;