Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 523b02ea authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix TKIP races, make API easier to use 



Our current TKIP code races against itself on TX
since we can process multiple packets at the same
time on different ACs, but they all share the TX
context for TKIP. This can lead to bad IVs etc.

Also, the crypto offload helper code just obtains
the P1K/P2K from the cache, and can update it as
well, but there's no guarantee that packets are
really processed in order.

To fix these issues, first introduce a spinlock
that will protect the IV16/IV32 values in the TX
context. This first step makes sure that we don't
assign the same IV multiple times or get confused
in other ways.

Secondly, change the way the P1K cache works. I
add a field "p1k_iv32" that stores the value of
the IV32 when the P1K was last recomputed, and
if different from the last time, then a new P1K
is recomputed. This can cause the P1K computation
to flip back and forth if packets are processed
out of order. All this also happens under the new
spinlock.

Finally, because there are argument differences,
split up the ieee80211_get_tkip_key() API into
ieee80211_get_tkip_p1k() and ieee80211_get_tkip_p2k()
and give them the correct arguments.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 397915c3

drivers/net/wireless/b43/xmit.c

+1 −2
Original line number Diff line number Diff line
@@ -323,8 +323,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, 
			/* we give the phase1key and iv16 here, the key is stored in

			 * shm. With that the hardware can do phase 2 and encryption.

			 */

			ieee80211_get_tkip_key(info->control.hw_key, skb_frag,

					IEEE80211_TKIP_P1_KEY, (u8*)phase1key);

			ieee80211_get_tkip_p1k(info->control.hw_key, skb_frag, phase1key);

			/* phase1key is in host endian. Copy to little-endian txhdr->iv. */

			for (i = 0; i < 5; i++) {

				txhdr->iv[i * 2 + 0] = phase1key[i];

drivers/net/wireless/iwlegacy/iwl-4965-tx.c

+1 −2
Original line number Diff line number Diff line
@@ -240,8 +240,7 @@ static void iwl4965_tx_cmd_build_hwcrypto(struct iwl_priv *priv, 


	case WLAN_CIPHER_SUITE_TKIP:

		tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;

		ieee80211_get_tkip_key(keyconf, skb_frag,

			IEEE80211_TKIP_P2_KEY, tx_cmd->key);

		ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);

		IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");

		break;

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+1 −2
Original line number Diff line number Diff line
@@ -497,8 +497,7 @@ static void iwlagn_tx_cmd_build_hwcrypto(struct iwl_priv *priv, 


	case WLAN_CIPHER_SUITE_TKIP:

		tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;

		ieee80211_get_tkip_key(keyconf, skb_frag,

			IEEE80211_TKIP_P2_KEY, tx_cmd->key);

		ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);

		IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");

		break;

include/net/mac80211.h

+22 −26
Original line number Diff line number Diff line
@@ -961,21 +961,6 @@ enum sta_notify_cmd { 
	STA_NOTIFY_SLEEP, STA_NOTIFY_AWAKE,

};



/**

 * enum ieee80211_tkip_key_type - get tkip key

 *

 * Used by drivers which need to get a tkip key for skb. Some drivers need a

 * phase 1 key, others need a phase 2 key. A single function allows the driver

 * to get the key, this enum indicates what type of key is required.

 *

 * @IEEE80211_TKIP_P1_KEY: the driver needs a phase 1 key

 * @IEEE80211_TKIP_P2_KEY: the driver needs a phase 2 key

 */

enum ieee80211_tkip_key_type {

	IEEE80211_TKIP_P1_KEY,

	IEEE80211_TKIP_P2_KEY,

};



/**

 * enum ieee80211_hw_flags - hardware flags

 *
@@ -2579,21 +2564,32 @@ struct sk_buff * 
ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif);



/**

 * ieee80211_get_tkip_key - get a TKIP rc4 for skb

 * ieee80211_get_tkip_p1k - get a TKIP phase 1 key

 *

 * This function returns the TKIP phase 1 key for the IV32 taken

 * from the given packet.

 *

 * @keyconf: the parameter passed with the set key

 * @skb: the packet to take the IV32 value from that will be encrypted

 *	with this P1K

 * @p1k: a buffer to which the key will be written, as 5 u16 values

 */

void ieee80211_get_tkip_p1k(struct ieee80211_key_conf *keyconf,

			    struct sk_buff *skb, u16 *p1k);



/**

 * ieee80211_get_tkip_p2k - get a TKIP phase 2 key

 *

 * This function computes a TKIP rc4 key for an skb. It computes

 * a phase 1 key if needed (iv16 wraps around). This function is to

 * be used by drivers which can do HW encryption but need to compute

 * to phase 1/2 key in SW.

 * This function computes the TKIP RC4 key for the IV values

 * in the packet.

 *

 * @keyconf: the parameter passed with the set key

 * @skb: the skb for which the key is needed

 * @type: TBD

 * @key: a buffer to which the key will be written

 * @skb: the packet to take the IV32/IV16 values from that will be

 *	encrypted with this key

 * @p2k: a buffer to which the key will be written, 16 bytes

 */

void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,

				struct sk_buff *skb,

				enum ieee80211_tkip_key_type type, u8 *key);

void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,

			    struct sk_buff *skb, u8 *p2k);



/**

 * ieee80211_gtk_rekey_notify - notify userspace supplicant of rekeying

net/mac80211/key.c

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ struct ieee80211_key *ieee80211_key_alloc(u32 cipher, int idx, size_t key_len, 
					get_unaligned_le16(seq);

			}

		}

		spin_lock_init(&key->u.tkip.txlock);

		break;

	case WLAN_CIPHER_SUITE_CCMP:

		key->conf.iv_len = CCMP_HDR_LEN;