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

Commit 57a85742 authored by Sara Sharon's avatar Sara Sharon Committed by Greg Kroah-Hartman
Browse files

iwlwifi: mvm: fix TX of CCMP 256 



[ Upstream commit de04d4fbf87b769ab18c480e4f020c53e74bbdd2 ]

We don't have enough room in the TX command for a CCMP 256
key, and need to use key from table.

Fixes: 3264bf032bd9 ("[BUGFIX] iwlwifi: mvm: Fix CCMP IV setting")
Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec12bb57

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -406,11 +406,11 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm, 
{

{

	struct ieee80211_key_conf *keyconf = info->control.hw_key;

	struct ieee80211_key_conf *keyconf = info->control.hw_key;

	u8 *crypto_hdr = skb_frag->data + hdrlen;

	u8 *crypto_hdr = skb_frag->data + hdrlen;

	enum iwl_tx_cmd_sec_ctrl type = TX_CMD_SEC_CCM;

	u64 pn;

	u64 pn;





	switch (keyconf->cipher) {

	switch (keyconf->cipher) {

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		iwl_mvm_set_tx_cmd_ccmp(info, tx_cmd);

		iwl_mvm_set_tx_cmd_ccmp(info, tx_cmd);

		iwl_mvm_set_tx_cmd_pn(info, crypto_hdr);

		iwl_mvm_set_tx_cmd_pn(info, crypto_hdr);

		break;

		break;
@@ -434,13 +434,16 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm, 
		break;

		break;

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP_256:

	case WLAN_CIPHER_SUITE_GCMP_256:

		type = TX_CMD_SEC_GCMP;

		/* Fall through */

	case WLAN_CIPHER_SUITE_CCMP_256:

		/* TODO: Taking the key from the table might introduce a race

		/* TODO: Taking the key from the table might introduce a race

		 * when PTK rekeying is done, having an old packets with a PN

		 * when PTK rekeying is done, having an old packets with a PN

		 * based on the old key but the message encrypted with a new

		 * based on the old key but the message encrypted with a new

		 * one.

		 * one.

		 * Need to handle this.

		 * Need to handle this.

		 */

		 */

		tx_cmd->sec_ctl |= TX_CMD_SEC_GCMP | TX_CMD_SEC_KEY_FROM_TABLE;

		tx_cmd->sec_ctl |= type | TX_CMD_SEC_KEY_FROM_TABLE;

		tx_cmd->key[0] = keyconf->hw_key_idx;

		tx_cmd->key[0] = keyconf->hw_key_idx;

		iwl_mvm_set_tx_cmd_pn(info, crypto_hdr);

		iwl_mvm_set_tx_cmd_pn(info, crypto_hdr);

		break;

		break;