wifi: mac80211: skip non-uploaded keys in ieee80211_iter_keys

[ Upstream commit 52009b419355195912a628d0a9847922e90c348c ]

Sync iterator conditions with ieee80211_iter_keys_rcu.

Fixes: 830af02f24fb ("mac80211: allow driver to iterate keys")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://patch.msgid.link/20241006153630.87885-1-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 6b089594a9f3fe344e6902d74df2ecfcf7b68c6f..3df4695caef6cee21a78460302d7a47354312b66 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -918,6 +918,26 @@ void ieee80211_reenable_keys(struct ieee80211_sub_if_data *sdata)
        mutex_unlock(&sdata->local->key_mtx);
 }
 
+static void
+ieee80211_key_iter(struct ieee80211_hw *hw,
+                  struct ieee80211_vif *vif,
+                  struct ieee80211_key *key,
+                  void (*iter)(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               struct ieee80211_sta *sta,
+                               struct ieee80211_key_conf *key,
+                               void *data),
+                  void *iter_data)
+{
+       /* skip keys of station in removal process */
+       if (key->sta && key->sta->removed)
+               return;
+       if (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))
+               return;
+       iter(hw, vif, key->sta ? &key->sta->sta : NULL,
+            &key->conf, iter_data);
+}
+
 void ieee80211_iter_keys(struct ieee80211_hw *hw,
                         struct ieee80211_vif *vif,
                         void (*iter)(struct ieee80211_hw *hw,
@@ -937,16 +957,13 @@ void ieee80211_iter_keys(struct ieee80211_hw *hw,
        if (vif) {
                sdata = vif_to_sdata(vif);
                list_for_each_entry_safe(key, tmp, &sdata->key_list, list)
-                       iter(hw, &sdata->vif,
-                            key->sta ? &key->sta->sta : NULL,
-                            &key->conf, iter_data);
+                       ieee80211_key_iter(hw, vif, key, iter, iter_data);
        } else {
                list_for_each_entry(sdata, &local->interfaces, list)
                        list_for_each_entry_safe(key, tmp,
                                                 &sdata->key_list, list)
-                               iter(hw, &sdata->vif,
-                                    key->sta ? &key->sta->sta : NULL,
-                                    &key->conf, iter_data);
+                               ieee80211_key_iter(hw, &sdata->vif, key,
+                                                  iter, iter_data);
        }
        mutex_unlock(&local->key_mtx);
 }
@@ -964,17 +981,8 @@ _ieee80211_iter_keys_rcu(struct ieee80211_hw *hw,
 {
        struct ieee80211_key *key;
 
-       list_for_each_entry_rcu(key, &sdata->key_list, list) {
-               /* skip keys of station in removal process */
-               if (key->sta && key->sta->removed)
-                       continue;
-               if (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))
-                       continue;
-
-               iter(hw, &sdata->vif,
-                    key->sta ? &key->sta->sta : NULL,
-                    &key->conf, iter_data);
-       }
+       list_for_each_entry_rcu(key, &sdata->key_list, list)
+               ieee80211_key_iter(hw, &sdata->vif, key, iter, iter_data);
 }
 
 void ieee80211_iter_keys_rcu(struct ieee80211_hw *hw,