wifi: brcmfmac: fix NULL pointer dereference in brcmf_txfinalize()
Subsystems (2)
PATCH v3 1/1 wifi: brcmfmac: fix NULL pointer dereference in brcmf_txfinalize()
On removal of the device or unloading of the kernel module a potential NULL pointer dereference occurs.
The following sequence deletes the interface:
brcmf_detach()
brcmf_remove_interface()
brcmf_del_if()Inside the brcmf_del_if() function the drvr->if2bss[ifidx] is updated to BRCMF_BSSIDX_INVALID (-1) if the bsscfgidx matches.
After brcmf_remove_interface() call the brcmf_proto_detach() function is called providing the following sequence:
brcmf_detach()
brcmf_proto_detach()
brcmf_proto_msgbuf_detach()
brcmf_flowring_detach()
brcmf_msgbuf_delete_flowring()
brcmf_msgbuf_remove_flowring()
brcmf_flowring_delete()
brcmf_get_ifp()
brcmf_txfinalize()Since brcmf_get_ip() can and actually will return NULL in this case the call to brcmf_txfinalize() will result in a NULL pointer dereference inside brcmf_txfinalize() when trying to update ifp->ndev->stats.tx_errors.
This will only happen if a flowring still has an skb.
Although the NULL pointer dereference has only been seen when trying to update the tx statistic, all other uses of the ifp pointer have been guarded as well with an early return if ifp is NULL.
---
v3:
- after review return early from brcmf_txfinalize() if ifp is NULL
- after review improve the subject line
v2: https://lore.kernel.org/linux-wireless/[email protected]/
- guard all uses of the ifp pointer inside brcmf_txfinalize()
v1: https://lore.kernel.org/linux-wireless/[email protected]/
- initial version
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +5 -0
@@ -540,6 +540,11 @@ void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success)struct ethhdr *eh;u16 type; +if (!ifp) { +brcmu_pkt_buf_free_skb (txp); +return ; + } + eh = (struct ethhdr *)(txp->data); type =ntohs (eh->h_proto);
Signature · 1 line
2.34.1
Quoted 29 lines · Marcel Hamer
On removal of the device or unloading of the kernel module a potential NULL pointer dereference occurs.
The following sequence deletes the interface:
brcmf_detach()
brcmf_remove_interface()brcmf_del_if()Inside the
brcmf_del_if()function the drvr->if2bss[ifidx] is updated toBRCMF_BSSIDX_INVALID(-1) if the bsscfgidx matches.After
brcmf_remove_interface()call thebrcmf_proto_detach()function is called providing the following sequence:
brcmf_detach()
brcmf_proto_detach()brcmf_proto_msgbuf_detach() brcmf_flowring_detach() brcmf_msgbuf_delete_flowring() brcmf_msgbuf_remove_flowring() brcmf_flowring_delete() brcmf_get_ifp() brcmf_txfinalize()Since
brcmf_get_ip()can and actually will return NULL in this case the call tobrcmf_txfinalize()will result in a NULL pointer dereference insidebrcmf_txfinalize()when trying to updateifp->ndev->stats.tx_errors.
Quoted 7 lines
This will only happen if a flowring still has an skb.
Although the NULL pointer dereference has only been seen when trying to update the tx statistic, all other uses of the ifp pointer have been guarded as well with an early return if ifp is NULL.
Quoted 2 lines
Quoted 31 lines · Marcel Hamer
On removal of the device or unloading of the kernel module a potential NULL pointer dereference occurs.
The following sequence deletes the interface:
brcmf_detach()brcmf_remove_interface() brcmf_del_if()Inside the
brcmf_del_if()function the drvr->if2bss[ifidx] is updated toBRCMF_BSSIDX_INVALID(-1) if the bsscfgidx matches.After
brcmf_remove_interface()call thebrcmf_proto_detach()function is called providing the following sequence:
brcmf_detach()brcmf_proto_detach() brcmf_proto_msgbuf_detach() brcmf_flowring_detach() brcmf_msgbuf_delete_flowring() brcmf_msgbuf_remove_flowring() brcmf_flowring_delete() brcmf_get_ifp() brcmf_txfinalize()Since
brcmf_get_ip()can and actually will return NULL in this case the call tobrcmf_txfinalize()will result in a NULL pointer dereference insidebrcmf_txfinalize()when trying to updateifp->ndev->stats.tx_errors.This will only happen if a flowring still has an skb.
Quoted 8 lines
Although the NULL pointer dereference has only been seen when trying to update the tx statistic, all other uses of the ifp pointer have been guarded as well with an early return if ifp is NULL.
Patch applied to wireless-next.git, thanks.
68abd0c4ebf2 wifi: brcmfmac: fix NULL pointer dereference in brcmf_txfinalize()
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches