Skip to content

Commit 205c503

Browse files
TropicaoKalle Valo
authored andcommitted
wifi: wilc1000: fix RCU usage in connect path
With lockdep enabled, calls to the connect function from cfg802.11 layer lead to the following warning: ============================= WARNING: suspicious RCU usage 6.7.0-rc1-wt+ msm8916-mainline#333 Not tainted ----------------------------- drivers/net/wireless/microchip/wilc1000/hif.c:386 suspicious rcu_dereference_check() usage! [...] stack backtrace: CPU: 0 PID: 100 Comm: wpa_supplicant Not tainted 6.7.0-rc1-wt+ msm8916-mainline#333 Hardware name: Atmel SAMA5 unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x34/0x48 dump_stack_lvl from wilc_parse_join_bss_param+0x7dc/0x7f4 wilc_parse_join_bss_param from connect+0x2c4/0x648 connect from cfg80211_connect+0x30c/0xb74 cfg80211_connect from nl80211_connect+0x860/0xa94 nl80211_connect from genl_rcv_msg+0x3fc/0x59c genl_rcv_msg from netlink_rcv_skb+0xd0/0x1f8 netlink_rcv_skb from genl_rcv+0x2c/0x3c genl_rcv from netlink_unicast+0x3b0/0x550 netlink_unicast from netlink_sendmsg+0x368/0x688 netlink_sendmsg from ____sys_sendmsg+0x190/0x430 ____sys_sendmsg from ___sys_sendmsg+0x110/0x158 ___sys_sendmsg from sys_sendmsg+0xe8/0x150 sys_sendmsg from ret_fast_syscall+0x0/0x1c This warning is emitted because in the connect path, when trying to parse target BSS parameters, we dereference a RCU pointer whithout being in RCU critical section. Fix RCU dereference usage by moving it to a RCU read critical section. To avoid wrapping the whole wilc_parse_join_bss_param under the critical section, just use the critical section to copy ies data Fixes: c460495 ("staging: wilc1000: fix incorrent type in initializer") Signed-off-by: Alexis Lothoré <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://msgid.link/[email protected]
1 parent 535733e commit 205c503

File tree

1 file changed

+24
-12
lines changed
  • drivers/net/wireless/microchip/wilc1000

1 file changed

+24
-12
lines changed

drivers/net/wireless/microchip/wilc1000/hif.c

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -377,38 +377,49 @@ struct wilc_join_bss_param *
377377
wilc_parse_join_bss_param(struct cfg80211_bss *bss,
378378
struct cfg80211_crypto_settings *crypto)
379379
{
380-
const struct cfg80211_bss_ies *ies = rcu_dereference(bss->ies);
381-
const u8 *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie;
380+
const u8 *ies_data, *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie;
382381
const u8 *ht_ie, *wpa_ie, *wmm_ie, *rsn_ie;
383382
struct ieee80211_p2p_noa_attr noa_attr;
383+
const struct cfg80211_bss_ies *ies;
384384
struct wilc_join_bss_param *param;
385-
u8 rates_len = 0;
385+
u8 rates_len = 0, ies_len;
386386
int ret;
387387

388388
param = kzalloc(sizeof(*param), GFP_KERNEL);
389389
if (!param)
390390
return NULL;
391391

392+
rcu_read_lock();
393+
ies = rcu_dereference(bss->ies);
394+
ies_data = kmemdup(ies->data, ies->len, GFP_ATOMIC);
395+
if (!ies_data) {
396+
rcu_read_unlock();
397+
kfree(param);
398+
return NULL;
399+
}
400+
ies_len = ies->len;
401+
rcu_read_unlock();
402+
392403
param->beacon_period = cpu_to_le16(bss->beacon_interval);
393404
param->cap_info = cpu_to_le16(bss->capability);
394405
param->bss_type = WILC_FW_BSS_TYPE_INFRA;
395406
param->ch = ieee80211_frequency_to_channel(bss->channel->center_freq);
396407
ether_addr_copy(param->bssid, bss->bssid);
397408

398-
ssid_elm = cfg80211_find_ie(WLAN_EID_SSID, ies->data, ies->len);
409+
ssid_elm = cfg80211_find_ie(WLAN_EID_SSID, ies_data, ies_len);
399410
if (ssid_elm) {
400411
if (ssid_elm[1] <= IEEE80211_MAX_SSID_LEN)
401412
memcpy(param->ssid, ssid_elm + 2, ssid_elm[1]);
402413
}
403414

404-
tim_elm = cfg80211_find_ie(WLAN_EID_TIM, ies->data, ies->len);
415+
tim_elm = cfg80211_find_ie(WLAN_EID_TIM, ies_data, ies_len);
405416
if (tim_elm && tim_elm[1] >= 2)
406417
param->dtim_period = tim_elm[3];
407418

408419
memset(param->p_suites, 0xFF, 3);
409420
memset(param->akm_suites, 0xFF, 3);
410421

411-
rates_ie = cfg80211_find_ie(WLAN_EID_SUPP_RATES, ies->data, ies->len);
422+
rates_ie = cfg80211_find_ie(WLAN_EID_SUPP_RATES, ies_data, ies_len);
412423
if (rates_ie) {
413424
rates_len = rates_ie[1];
414425
if (rates_len > WILC_MAX_RATES_SUPPORTED)
@@ -419,7 +430,7 @@ wilc_parse_join_bss_param(struct cfg80211_bss *bss,
419430

420431
if (rates_len < WILC_MAX_RATES_SUPPORTED) {
421432
supp_rates_ie = cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES,
422-
ies->data, ies->len);
433+
ies_data, ies_len);
423434
if (supp_rates_ie) {
424435
u8 ext_rates = supp_rates_ie[1];
425436

@@ -434,11 +445,11 @@ wilc_parse_join_bss_param(struct cfg80211_bss *bss,
434445
}
435446
}
436447

437-
ht_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, ies->data, ies->len);
448+
ht_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, ies_data, ies_len);
438449
if (ht_ie)
439450
param->ht_capable = true;
440451

441-
ret = cfg80211_get_p2p_attr(ies->data, ies->len,
452+
ret = cfg80211_get_p2p_attr(ies_data, ies_len,
442453
IEEE80211_P2P_ATTR_ABSENCE_NOTICE,
443454
(u8 *)&noa_attr, sizeof(noa_attr));
444455
if (ret > 0) {
@@ -462,7 +473,7 @@ wilc_parse_join_bss_param(struct cfg80211_bss *bss,
462473
}
463474
wmm_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
464475
WLAN_OUI_TYPE_MICROSOFT_WMM,
465-
ies->data, ies->len);
476+
ies_data, ies_len);
466477
if (wmm_ie) {
467478
struct ieee80211_wmm_param_ie *ie;
468479

@@ -477,13 +488,13 @@ wilc_parse_join_bss_param(struct cfg80211_bss *bss,
477488

478489
wpa_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
479490
WLAN_OUI_TYPE_MICROSOFT_WPA,
480-
ies->data, ies->len);
491+
ies_data, ies_len);
481492
if (wpa_ie) {
482493
param->mode_802_11i = 1;
483494
param->rsn_found = true;
484495
}
485496

486-
rsn_ie = cfg80211_find_ie(WLAN_EID_RSN, ies->data, ies->len);
497+
rsn_ie = cfg80211_find_ie(WLAN_EID_RSN, ies_data, ies_len);
487498
if (rsn_ie) {
488499
int rsn_ie_len = sizeof(struct element) + rsn_ie[1];
489500
int offset = 8;
@@ -517,6 +528,7 @@ wilc_parse_join_bss_param(struct cfg80211_bss *bss,
517528
param->akm_suites[i] = crypto->akm_suites[i] & 0xFF;
518529
}
519530

531+
kfree(ies_data);
520532
return (void *)param;
521533
}
522534

0 commit comments

Comments
 (0)