wifi: mac80211: fix link data leak

During the code reshuffling, I accidentally set this to
NULL before using it, fix that to fix the link data leak.

Fixes: 884435977b0c ("wifi: mac80211: fix link manipulation")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index e544621ead0ef80507f20763bc0d81240f2d3369..95b58c5cac07f48b7b140ca678636e320d1b6961 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -514,18 +514,18 @@ static int ieee80211_vif_update_links(struct ieee80211_sub_if_data *sdata,
 
        /* grab old links to free later */
        for_each_set_bit(link_id, &rem, IEEE80211_MLD_MAX_NUM_LINKS) {
+               if (rcu_access_pointer(sdata->link[link_id]) != &sdata->deflink) {
+                       /*
+                        * we must have allocated the data through this path so
+                        * we know we can free both at the same time
+                        */
+                       to_free[link_id] = container_of(rcu_access_pointer(sdata->link[link_id]),
+                                                       typeof(*links[link_id]),
+                                                       data);
+               }
+
                RCU_INIT_POINTER(sdata->link[link_id], NULL);
                RCU_INIT_POINTER(sdata->vif.link_conf[link_id], NULL);
-
-               if (rcu_access_pointer(sdata->link[link_id]) == &sdata->deflink)
-                       continue;
-               /*
-                * we must have allocated the data through this path so
-                * we know we can free both at the same time
-                */
-               to_free[link_id] = container_of(rcu_access_pointer(sdata->link[link_id]),
-                                               typeof(*links[link_id]),
-                                               data);
        }
 
        /* link them into data structures */