Skip to content

Commit ed73086

Browse files
jmberg-intelvijay-suman
authored andcommitted
wifi: iwlwifi: mvm: don't set replay counters to 0xff
[ Upstream commit d5bd404 ] The firmware (later) actually uses the values even for keys that are invalid as far as the host is concerned, later in rekeying, and then only sets the low 48 bits since the PNs are only 48 bits over the air. It does, however, compare the full 64 bits later, obviously causing problems. Remove the memset and use kzalloc instead to avoid any old heap data leaking to the firmware. We already init all the other fields in the struct anyway. This leaves the data set to zero for any unused fields, so the firmware can look at them safely even if they're not used right now. Fixes: 79e561f ("iwlwifi: mvm: d3: implement RSC command version 5") Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://msgid.link/20240206175739.462101146fef.I10f3855b99417af4247cff04af78dcbc6cb75c9c@changeid Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit f94625ec57477f16dab523f8eda38705ee75bd86) Signed-off-by: Vijayendra Suman <[email protected]>
1 parent 03ca358 commit ed73086

File tree

1 file changed

+1
-3
lines changed
  • drivers/net/wireless/intel/iwlwifi/mvm

1 file changed

+1
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,12 +462,10 @@ static int iwl_mvm_wowlan_config_rsc_tsc(struct iwl_mvm *mvm,
462462
struct wowlan_key_rsc_v5_data data = {};
463463
int i;
464464

465-
data.rsc = kmalloc(sizeof(*data.rsc), GFP_KERNEL);
465+
data.rsc = kzalloc(sizeof(*data.rsc), GFP_KERNEL);
466466
if (!data.rsc)
467467
return -ENOMEM;
468468

469-
memset(data.rsc, 0xff, sizeof(*data.rsc));
470-
471469
for (i = 0; i < ARRAY_SIZE(data.rsc->mcast_key_id_map); i++)
472470
data.rsc->mcast_key_id_map[i] =
473471
IWL_MCAST_KEY_MAP_INVALID;

0 commit comments

Comments
 (0)