Skip to content

Commit 745003b

Browse files
TropicaoSasha Levin
authored andcommitted
wifi: wilc1000: fix RCU usage in connect path
[ Upstream commit 205c503 ] 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+ torvalds#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+ torvalds#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é <alexis.lothore@bootlin.com> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://msgid.link/20240105075733.36331-3-alexis.lothore@bootlin.com Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent d876625 commit 745003b

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
@@ -374,38 +374,49 @@ static void handle_connect_timeout(struct work_struct *work)
374374
void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
375375
struct cfg80211_crypto_settings *crypto)
376376
{
377-
const struct cfg80211_bss_ies *ies = rcu_dereference(bss->ies);
378-
const u8 *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie;
377+
const u8 *ies_data, *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie;
379378
const u8 *ht_ie, *wpa_ie, *wmm_ie, *rsn_ie;
380379
struct ieee80211_p2p_noa_attr noa_attr;
380+
const struct cfg80211_bss_ies *ies;
381381
struct wilc_join_bss_param *param;
382-
u8 rates_len = 0;
382+
u8 rates_len = 0, ies_len;
383383
int ret;
384384

385385
param = kzalloc(sizeof(*param), GFP_KERNEL);
386386
if (!param)
387387
return NULL;
388388

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

395-
ssid_elm = cfg80211_find_ie(WLAN_EID_SSID, ies->data, ies->len);
406+
ssid_elm = cfg80211_find_ie(WLAN_EID_SSID, ies_data, ies_len);
396407
if (ssid_elm) {
397408
if (ssid_elm[1] <= IEEE80211_MAX_SSID_LEN)
398409
memcpy(param->ssid, ssid_elm + 2, ssid_elm[1]);
399410
}
400411

401-
tim_elm = cfg80211_find_ie(WLAN_EID_TIM, ies->data, ies->len);
412+
tim_elm = cfg80211_find_ie(WLAN_EID_TIM, ies_data, ies_len);
402413
if (tim_elm && tim_elm[1] >= 2)
403414
param->dtim_period = tim_elm[3];
404415

405416
memset(param->p_suites, 0xFF, 3);
406417
memset(param->akm_suites, 0xFF, 3);
407418

408-
rates_ie = cfg80211_find_ie(WLAN_EID_SUPP_RATES, ies->data, ies->len);
419+
rates_ie = cfg80211_find_ie(WLAN_EID_SUPP_RATES, ies_data, ies_len);
409420
if (rates_ie) {
410421
rates_len = rates_ie[1];
411422
if (rates_len > WILC_MAX_RATES_SUPPORTED)
@@ -416,7 +427,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
416427

417428
if (rates_len < WILC_MAX_RATES_SUPPORTED) {
418429
supp_rates_ie = cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES,
419-
ies->data, ies->len);
430+
ies_data, ies_len);
420431
if (supp_rates_ie) {
421432
u8 ext_rates = supp_rates_ie[1];
422433

@@ -431,11 +442,11 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
431442
}
432443
}
433444

434-
ht_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, ies->data, ies->len);
445+
ht_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, ies_data, ies_len);
435446
if (ht_ie)
436447
param->ht_capable = true;
437448

438-
ret = cfg80211_get_p2p_attr(ies->data, ies->len,
449+
ret = cfg80211_get_p2p_attr(ies_data, ies_len,
439450
IEEE80211_P2P_ATTR_ABSENCE_NOTICE,
440451
(u8 *)&noa_attr, sizeof(noa_attr));
441452
if (ret > 0) {
@@ -459,7 +470,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
459470
}
460471
wmm_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
461472
WLAN_OUI_TYPE_MICROSOFT_WMM,
462-
ies->data, ies->len);
473+
ies_data, ies_len);
463474
if (wmm_ie) {
464475
struct ieee80211_wmm_param_ie *ie;
465476

@@ -474,13 +485,13 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
474485

475486
wpa_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
476487
WLAN_OUI_TYPE_MICROSOFT_WPA,
477-
ies->data, ies->len);
488+
ies_data, ies_len);
478489
if (wpa_ie) {
479490
param->mode_802_11i = 1;
480491
param->rsn_found = true;
481492
}
482493

483-
rsn_ie = cfg80211_find_ie(WLAN_EID_RSN, ies->data, ies->len);
494+
rsn_ie = cfg80211_find_ie(WLAN_EID_RSN, ies_data, ies_len);
484495
if (rsn_ie) {
485496
int rsn_ie_len = sizeof(struct element) + rsn_ie[1];
486497
int offset = 8;
@@ -514,6 +525,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
514525
param->akm_suites[i] = crypto->akm_suites[i] & 0xFF;
515526
}
516527

528+
kfree(ies_data);
517529
return (void *)param;
518530
}
519531

0 commit comments

Comments
 (0)