From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 11 Jul 2022 09:53:20 +0000 (+0200)
Subject: wifi: nl80211: reject link specific elements on assoc link
X-Git-Tag: v6.0-rc1~141^2~64^2~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34d76a14f8f75df1b37557247a973b9093c74a24;p=thirdparty%2Fkernel%2Flinux.git

wifi: nl80211: reject link specific elements on assoc link

When we associate, we'll include all the elements for the
link we're sending the association request on in the frame
and the specific ones for other links in the multi-link
element container. Prohibit adding link-specific elements
for the association link.

Fixes: d648c23024bd ("wifi: nl80211: support MLO in auth/assoc")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ead9bd1112801..be969f64b5c37 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -10813,6 +10813,13 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
 			goto free;
 		}
 
+		if (req.links[req.link_id].elems_len) {
+			GENL_SET_ERR_MSG(info,
+					 "cannot have per-link elems on assoc link");
+			err = -EINVAL;
+			goto free;
+		}
+
 		kfree(attrs);
 		attrs = NULL;
 	} else {