From c22bb3d377c878e64369bec5afadc969ed182251 Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:30 +0100 Subject: [PATCH] Revert "wifi: wilc1000: fix potential RCU dereference issue in wilc_parse_join_bss_param" This reverts commit 42ac5e3f69d985a1a4040a5e7ba14ddd7e31a689. --- drivers/net/wireless/microchip/wilc1000/hif.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c index 5f363653e..3f167bf4e 100755 --- a/drivers/net/wireless/microchip/wilc1000/hif.c +++ b/drivers/net/wireless/microchip/wilc1000/hif.c @@ -366,7 +366,6 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, struct wilc_join_bss_param *param; u8 rates_len = 0; int ies_len; - u64 ies_tsf; int ret; param = kzalloc(sizeof(*param), GFP_KERNEL); @@ -382,7 +381,6 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, return NULL; } ies_len = ies->len; - ies_tsf = ies->tsf; rcu_read_unlock(); param->beacon_period = cpu_to_le16(bss->beacon_interval); @@ -438,7 +436,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, IEEE80211_P2P_ATTR_ABSENCE_NOTICE, (u8 *)&noa_attr, sizeof(noa_attr)); if (ret > 0) { - param->tsf_lo = cpu_to_le32(ies_tsf); + param->tsf_lo = cpu_to_le32(ies->tsf); param->noa_enabled = 1; param->idx = noa_attr.index; if (noa_attr.oppps_ctwindow & IEEE80211_P2P_OPPPS_ENABLE_BIT) {