Skip to content

Commit 3d752e3

Browse files
gokulkumar-ifxpopcornmix
authored andcommitted
wifi: brcmfmac: fix crash while sending Action Frames in standalone AP Mode
commit 3776c685ebe5f43e9060af06872661de55e80b9a upstream. Currently, whenever there is a need to transmit an Action frame, the brcmfmac driver always uses the P2P vif to send the "actframe" IOVAR to firmware. The P2P interfaces were available when wpa_supplicant is managing the wlan interface. However, the P2P interfaces are not created/initialized when only hostapd is managing the wlan interface. And if hostapd receives an ANQP Query REQ Action frame even from an un-associated STA, the brcmfmac driver tries to use an uninitialized P2P vif pointer for sending the IOVAR to firmware. This NULL pointer dereferencing triggers a driver crash. [ 1417.074538] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [...] [ 1417.075188] Hardware name: Raspberry Pi 4 Model B Rev 1.5 (DT) [...] [ 1417.075653] Call trace: [ 1417.075662] brcmf_p2p_send_action_frame+0x23c/0xc58 [brcmfmac] [ 1417.075738] brcmf_cfg80211_mgmt_tx+0x304/0x5c0 [brcmfmac] [ 1417.075810] cfg80211_mlme_mgmt_tx+0x1b0/0x428 [cfg80211] [ 1417.076067] nl80211_tx_mgmt+0x238/0x388 [cfg80211] [ 1417.076281] genl_family_rcv_msg_doit+0xe0/0x158 [ 1417.076302] genl_rcv_msg+0x220/0x2a0 [ 1417.076317] netlink_rcv_skb+0x68/0x140 [ 1417.076330] genl_rcv+0x40/0x60 [ 1417.076343] netlink_unicast+0x330/0x3b8 [ 1417.076357] netlink_sendmsg+0x19c/0x3f8 [ 1417.076370] __sock_sendmsg+0x64/0xc0 [ 1417.076391] ____sys_sendmsg+0x268/0x2a0 [ 1417.076408] ___sys_sendmsg+0xb8/0x118 [ 1417.076427] __sys_sendmsg+0x90/0xf8 [ 1417.076445] __arm64_sys_sendmsg+0x2c/0x40 [ 1417.076465] invoke_syscall+0x50/0x120 [ 1417.076486] el0_svc_common.constprop.0+0x48/0xf0 [ 1417.076506] do_el0_svc+0x24/0x38 [ 1417.076525] el0_svc+0x30/0x100 [ 1417.076548] el0t_64_sync_handler+0x100/0x130 [ 1417.076569] el0t_64_sync+0x190/0x198 [ 1417.076589] Code: f9401e80 aa1603e2 f9403be1 5280e483 (f9400000) Fix this, by always using the vif corresponding to the wdev on which the Action frame Transmission request was initiated by the userspace. This way, even if P2P vif is not available, the IOVAR is sent to firmware on AP vif and the ANQP Query RESP Action frame is transmitted without crashing the driver. Move init_completion() for "send_af_done" from brcmf_p2p_create_p2pdev() to brcmf_p2p_attach(). Because the former function would not get executed when only hostapd is managing wlan interface, and it is not safe to do reinit_completion() later in brcmf_p2p_tx_action_frame(), without any prior init_completion(). And in the brcmf_p2p_tx_action_frame() function, the condition check for P2P Presence response frame is not needed, since the wpa_supplicant is properly sending the P2P Presense Response frame on the P2P-GO vif instead of the P2P-Device vif. Cc: [email protected] Fixes: 18e2f61 ("brcmfmac: P2P action frame tx") Signed-off-by: Gokul Sivakumar <[email protected]> Acked-by: Arend van Spriel <[email protected]> Link: https://patch.msgid.link/[email protected] [Cc stable] Signed-off-by: Johannes Berg <[email protected]>
1 parent d493fb3 commit 3d752e3

File tree

3 files changed

+12
-22
lines changed

3 files changed

+12
-22
lines changed

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5643,8 +5643,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
56435643
*cookie, le16_to_cpu(action_frame->len),
56445644
le32_to_cpu(af_params->channel));
56455645

5646-
ack = brcmf_p2p_send_action_frame(cfg, cfg_to_ndev(cfg),
5647-
af_params);
5646+
ack = brcmf_p2p_send_action_frame(vif->ifp, af_params);
56485647

56495648
cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, ack,
56505649
GFP_KERNEL);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,6 +1533,7 @@ int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp,
15331533
/**
15341534
* brcmf_p2p_tx_action_frame() - send action frame over fil.
15351535
*
1536+
* @ifp: interface to transmit on.
15361537
* @p2p: p2p info struct for vif.
15371538
* @af_params: action frame data/info.
15381539
*
@@ -1542,12 +1543,11 @@ int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp,
15421543
* The WLC_E_ACTION_FRAME_COMPLETE event will be received when the action
15431544
* frame is transmitted.
15441545
*/
1545-
static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
1546+
static s32 brcmf_p2p_tx_action_frame(struct brcmf_if *ifp,
1547+
struct brcmf_p2p_info *p2p,
15461548
struct brcmf_fil_af_params_le *af_params)
15471549
{
15481550
struct brcmf_pub *drvr = p2p->cfg->pub;
1549-
struct brcmf_cfg80211_vif *vif;
1550-
struct brcmf_p2p_action_frame *p2p_af;
15511551
s32 err = 0;
15521552

15531553
brcmf_dbg(TRACE, "Enter\n");
@@ -1556,14 +1556,7 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
15561556
clear_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status);
15571557
clear_bit(BRCMF_P2P_STATUS_ACTION_TX_NOACK, &p2p->status);
15581558

1559-
/* check if it is a p2p_presence response */
1560-
p2p_af = (struct brcmf_p2p_action_frame *)af_params->action_frame.data;
1561-
if (p2p_af->subtype == P2P_AF_PRESENCE_RSP)
1562-
vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif;
1563-
else
1564-
vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1565-
1566-
err = brcmf_fil_bsscfg_data_set(vif->ifp, "actframe", af_params,
1559+
err = brcmf_fil_bsscfg_data_set(ifp, "actframe", af_params,
15671560
sizeof(*af_params));
15681561
if (err) {
15691562
bphy_err(drvr, " sending action frame has failed\n");
@@ -1715,16 +1708,14 @@ static bool brcmf_p2p_check_dwell_overflow(u32 requested_dwell,
17151708
/**
17161709
* brcmf_p2p_send_action_frame() - send action frame .
17171710
*
1718-
* @cfg: driver private data for cfg80211 interface.
1719-
* @ndev: net device to transmit on.
1711+
* @ifp: interface to transmit on.
17201712
* @af_params: configuration data for action frame.
17211713
*/
1722-
bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
1723-
struct net_device *ndev,
1714+
bool brcmf_p2p_send_action_frame(struct brcmf_if *ifp,
17241715
struct brcmf_fil_af_params_le *af_params)
17251716
{
1717+
struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
17261718
struct brcmf_p2p_info *p2p = &cfg->p2p;
1727-
struct brcmf_if *ifp = netdev_priv(ndev);
17281719
struct brcmf_fil_action_frame_le *action_frame;
17291720
struct brcmf_config_af_params config_af_params;
17301721
struct afx_hdl *afx_hdl = &p2p->afx_hdl;
@@ -1862,7 +1853,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
18621853
if (af_params->channel)
18631854
msleep(P2P_AF_RETRY_DELAY_TIME);
18641855

1865-
ack = !brcmf_p2p_tx_action_frame(p2p, af_params);
1856+
ack = !brcmf_p2p_tx_action_frame(ifp, p2p, af_params);
18661857
tx_retry++;
18671858
dwell_overflow = brcmf_p2p_check_dwell_overflow(requested_dwell,
18681859
dwell_jiffies);
@@ -2222,7 +2213,6 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
22222213

22232214
WARN_ON(p2p_ifp->bsscfgidx != bsscfgidx);
22242215

2225-
init_completion(&p2p->send_af_done);
22262216
INIT_WORK(&p2p->afx_hdl.afx_work, brcmf_p2p_afx_handler);
22272217
init_completion(&p2p->afx_hdl.act_frm_scan);
22282218
init_completion(&p2p->wait_next_af);
@@ -2518,6 +2508,8 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced)
25182508
pri_ifp = brcmf_get_ifp(cfg->pub, 0);
25192509
p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif = pri_ifp->vif;
25202510

2511+
init_completion(&p2p->send_af_done);
2512+
25212513
if (p2pdev_forced) {
25222514
err_ptr = brcmf_p2p_create_p2pdev(p2p, NULL, NULL);
25232515
if (IS_ERR(err_ptr)) {

drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
168168
int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp,
169169
const struct brcmf_event_msg *e,
170170
void *data);
171-
bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
172-
struct net_device *ndev,
171+
bool brcmf_p2p_send_action_frame(struct brcmf_if *ifp,
173172
struct brcmf_fil_af_params_le *af_params);
174173
bool brcmf_p2p_scan_finding_common_channel(struct brcmf_cfg80211_info *cfg,
175174
struct brcmf_bss_info_le *bi);

0 commit comments

Comments
 (0)