Commit b101dd2d authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: fix encryption key selection for 802.3 xmit 



When using WEP, the default unicast key needs to be selected, instead of
the STA PTK.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20201218184718.93650-4-nbd@nbd.name


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 622d3b4e

net/mac80211/tx.c

+15 −12
Original line number Diff line number Diff line
@@ -4251,7 +4251,6 @@ netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, 
	struct ethhdr *ehdr = (struct ethhdr *)skb->data;

	struct ieee80211_key *key;

	struct sta_info *sta;

	bool offload = true;



	if (unlikely(skb->len < ETH_HLEN)) {

		kfree_skb(skb);
@@ -4268,17 +4267,21 @@ netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, 
	if (unlikely(IS_ERR_OR_NULL(sta) || !sta->uploaded ||

	    !test_sta_flag(sta, WLAN_STA_AUTHORIZED) ||

	    sdata->control_port_protocol == ehdr->h_proto))

		offload = false;

	else if ((key = rcu_dereference(sta->ptk[sta->ptk_idx])) &&

		 (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) ||

		goto skip_offload;



	key = rcu_dereference(sta->ptk[sta->ptk_idx]);

	if (!key)

		key = rcu_dereference(sdata->default_unicast_key);



	if (key && (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) ||

		    key->conf.cipher == WLAN_CIPHER_SUITE_TKIP))

		offload = false;

		goto skip_offload;



	if (offload)

	ieee80211_8023_xmit(sdata, dev, sta, key, skb);

	else

		ieee80211_subif_start_xmit(skb, dev);

	goto out;



skip_offload:

	ieee80211_subif_start_xmit(skb, dev);

out:

	rcu_read_unlock();