From: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
Date: Sat, 30 Jul 2022 05:26:42 +0000 (+0530)
Subject: wifi: cfg80211: Prevent cfg80211_wext_siwencodeext() on MLD
X-Git-Tag: v6.1-rc1~170^2~329^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa129bcd34b6de2c37b5145da54a57901d5195bc;p=thirdparty%2Flinux.git

wifi: cfg80211: Prevent cfg80211_wext_siwencodeext() on MLD

Currently, MLO support is not added for WEXT code and WEXT handlers are
prevented on MLDs. Prevent WEXT handler cfg80211_wext_siwencodeext()
also on MLD which is missed in commit 7b0a0e3c3a88 ("wifi: cfg80211: do
some rework towards MLO link APIs")

Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
Link: https://lore.kernel.org/r/20220730052643.1959111-3-quic_vjakkam@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index a9767bfe73300..129d3bb91dfb1 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -685,6 +685,13 @@ static int cfg80211_wext_siwencodeext(struct net_device *dev,
 	    !rdev->ops->set_default_key)
 		return -EOPNOTSUPP;
 
+	wdev_lock(wdev);
+	if (wdev->valid_links) {
+		wdev_unlock(wdev);
+		return -EOPNOTSUPP;
+	}
+	wdev_unlock(wdev);
+
 	switch (ext->alg) {
 	case IW_ENCODE_ALG_NONE:
 		remove = true;