linux-next: manual merge of the wireless-next tree with the wireless tree

[Mark Brown]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  net/mac80211/link.c

between commits:

  a155ef2ef7953 ("wifi: mac80211: fix use-after-free when MLO link setup is rolled back")
  745f5d04395df ("wifi: mac80211: drain link readers before stopping removed links")
  bb22f3b2d8f8a ("wifi: mac80211: restore dormant links when link updates fail")

from the wireless tree and commit:

  89e2600dc1f29 ("wifi: mac80211: refactor link handling")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/mac80211/link.c
index f43c0dec8cc9f,428759f8dec30..0000000000000
--- a/net/mac80211/link.c
+++ b/net/mac80211/link.c
@@@ -206,17 -255,13 +256,18 @@@ static void ieee80211_tear_down_links(s
  		if (WARN_ON(!link))
  			continue;
  		ieee80211_remove_link_keys(link, &keys);
- 		ieee80211_link_debugfs_remove(link);
 -		ieee80211_link_stop(link);
 +		stop[link_id] = link;
+ 		if (link == &sdata->deflink)
+ 			ieee80211_link_debugfs_remove(link);
  	}
  
 +	/* drain RCU readers before cancelling work they may queue */
  	synchronize_rcu();
  
 +	for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++)
 +		if (stop[link_id])
 +			ieee80211_link_stop(stop[link_id]);
 +
  	ieee80211_free_key_list(sdata->local, &keys);
  }
  
@@@ -404,16 -440,14 +447,15 @@@ static int ieee80211_vif_update_links(s
  		ret = 0;
  
  	if (ret) {
- 		/* restore config */
- 		memcpy(sdata->link, old_data, sizeof(old_data));
- 		memcpy(sdata->vif.link_conf, old, sizeof(old));
+ 		/* restore config; add/rem can overlap on link 0, so detach first */
+ 		for_each_set_bit(link_id, &add, IEEE80211_MLD_MAX_NUM_LINKS)
+ 			ieee80211_link_detach(&links[link_id]->data);
+ 		for_each_set_bit(link_id, &rem, IEEE80211_MLD_MAX_NUM_LINKS)
+ 			ieee80211_link_attach(old_data[link_id]);
 -		ieee80211_set_vif_links_bitmaps(sdata, old_links, dormant_links);
 +		ieee80211_set_vif_links_bitmaps(sdata, old_links, old_dormant);
- 		/* drain RCU readers before cancelling work they may queue */
++
+ 		/* the new links were published, wait before freeing them */
  		synchronize_rcu();
- 		for_each_set_bit(link_id, &add, IEEE80211_MLD_MAX_NUM_LINKS) {
- 			ieee80211_link_debugfs_remove(&links[link_id]->data);
- 			ieee80211_link_stop(&links[link_id]->data);
- 		}
  		/* and free (only) the newly allocated links */
  		memset(to_free, 0, sizeof(links));
  		goto free;

Attachment: signature.asc
Description: PGP signature