From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 285F813C801; Tue, 18 Jun 2024 12:42:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718714522; cv=none; b=KZeo1j7k0YZr+JGFWz0p20uJDivsDPqCjX1rWWDoV86RPRQt5TEHu0kOFxcNADWVguTnzcwEyUrP/I5rXqFoLY8eKAiuHSlzT7YSmicMkNClXWtE9XpGC54VGqk61r1E20diinOg5XcT6L5kV20WIwJg5m1lM9Uu7VnLNOguzMQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718714522; c=relaxed/simple; bh=hGELTWT64dy1t2dAK0Bdf0Ge04DzJ4GkdbOEaR5s/d4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N9wTz2/Y1jIHJUetKASbn3HTaSFqqySyX54cuQ/VRakxwbepzAWdk0YUHBnSbsjwLRjhhDWXHspwUKsXboCPVRX8st7eYUQKaitbYsw9z0GLO3wXVn/WHy/m5GLwRSY3n/A9U6dNW9QtH89h3VsXmPBKHFQ4Pw8g8kd0f6rbYl0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FzpQEr8G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FzpQEr8G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB9F6C3277B; Tue, 18 Jun 2024 12:42:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718714522; bh=hGELTWT64dy1t2dAK0Bdf0Ge04DzJ4GkdbOEaR5s/d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FzpQEr8Ga+SURhAm9575+ZQy3+NlSnRReakP5QCvWj4h7mv9hDv+x0D2pp3YWfDz3 /6f61UbMfZtd9n6QBKrakFYsFRhx6F0+3lfEoF7oWS2i93zZNVrVohnyB3SzX9bedD Y6YCV86RBp/IDmvVOw3hzoD6my21idBP2WKO7+T8r5EwyQ6+48NeVxxlmOwQWHZVX1 DJSYTaTExXyXOa/dePc9YXtVAZxboeToQMdY44YSGdGd0ZP4Ju9bluAeNVOuwTLnHS wxL5+AOQPpo6mInhtejWI4hpidTvABtqQCPac29axLxlfugkIU0KGC1Cy6mT/3dLqO XlsdeUnU1Rt8g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yedidya Benshimol , Miri Korenblit , Johannes Berg , Sasha Levin , kvalo@kernel.org, gregory.greenman@intel.com, shaul.triebitz@intel.com, benjamin.berg@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 11/21] wifi: iwlwifi: mvm: Handle BIGTK cipher in kek_kck cmd Date: Tue, 18 Jun 2024 08:41:10 -0400 Message-ID: <20240618124139.3303801-11-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240618124139.3303801-1-sashal@kernel.org> References: <20240618124139.3303801-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.161 Content-Transfer-Encoding: 8bit From: Yedidya Benshimol [ Upstream commit 08b16d1b5997dc378533318e2a9cd73c7a898284 ] The BIGTK cipher field was added to the kek_kck_material_cmd but wasn't assigned. Fix that by differentiating between the IGTK/BIGTK keys and assign the ciphers fields accordingly. Signed-off-by: Yedidya Benshimol Signed-off-by: Miri Korenblit Link: https://msgid.link/20240513132416.7fd0b22b7267.Ie9b581652b74bd7806980364d59e1b2e78e682c0@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c index f9b004d139501..24c1666b2c88a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c @@ -595,16 +595,25 @@ static void iwl_mvm_wowlan_gtk_type_iter(struct ieee80211_hw *hw, void *_data) { struct wowlan_key_gtk_type_iter *data = _data; + __le32 *cipher = NULL; + + if (key->keyidx == 4 || key->keyidx == 5) + cipher = &data->kek_kck_cmd->igtk_cipher; + if (key->keyidx == 6 || key->keyidx == 7) + cipher = &data->kek_kck_cmd->bigtk_cipher; switch (key->cipher) { default: return; case WLAN_CIPHER_SUITE_BIP_GMAC_256: case WLAN_CIPHER_SUITE_BIP_GMAC_128: - data->kek_kck_cmd->igtk_cipher = cpu_to_le32(STA_KEY_FLG_GCMP); + if (cipher) + *cipher = cpu_to_le32(STA_KEY_FLG_GCMP); return; case WLAN_CIPHER_SUITE_AES_CMAC: - data->kek_kck_cmd->igtk_cipher = cpu_to_le32(STA_KEY_FLG_CCM); + case WLAN_CIPHER_SUITE_BIP_CMAC_256: + if (cipher) + *cipher = cpu_to_le32(STA_KEY_FLG_CCM); return; case WLAN_CIPHER_SUITE_CCMP: if (!sta) -- 2.43.0