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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130326114852.770f3e14f4b59aa29800e7f7@canb.auug.org.au>
Date:	Tue, 26 Mar 2013 11:48:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Johannes Berg <johannes.berg@...el.com>,
	"John W. Linville" <linville@...driver.com>
Subject: linux-next: manual merge of the net-next tree with the wireless
 tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/sta_info.c between commit 27a737ff7cb0 ("mac80211: always
synchronize_net() during station removal") from the wireless tree and
commit 8d1f7ecd2af5 ("mac80211: defer tailroom counter manipulation when
roaming") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc net/mac80211/sta_info.c
index 238a0cc,3644ad7..0000000
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@@ -794,19 -798,14 +799,21 @@@ int __must_check __sta_info_destroy(str
  	list_del_rcu(&sta->list);
  
  	mutex_lock(&local->key_mtx);
 -	for (i = 0; i < NUM_DEFAULT_KEYS; i++)
 +	for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
- 		__ieee80211_key_free(key_mtx_dereference(local, sta->gtk[i]));
+ 		__ieee80211_key_free(key_mtx_dereference(local, sta->gtk[i]),
+ 				     true);
 -	if (sta->ptk)
 +		have_key = true;
 +	}
 +	if (sta->ptk) {
- 		__ieee80211_key_free(key_mtx_dereference(local, sta->ptk));
+ 		__ieee80211_key_free(key_mtx_dereference(local, sta->ptk),
+ 				     true);
 +		have_key = true;
 +	}
  	mutex_unlock(&local->key_mtx);
  
 +	if (!have_key)
 +		synchronize_net();
 +
  	sta->dead = true;
  
  	local->num_sta--;

Content of type "application/pgp-signature" skipped