From 33eac5ea71cc81e646019532263bb22620a12338 Mon Sep 17 00:00:00 2001 From: Ramesh Rangavittal Date: Tue, 11 Apr 2023 13:50:20 -0500 Subject: [PATCH 154/296] brcmfmac: Fix a NULL pointer dereference --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index bd53f3ba8841..64b2689ba2e7 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -978,10 +978,11 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, void brcmf_remove_interface(struct brcmf_if *ifp, bool locked) { - if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bsscfgidx] != ifp)) + if (!ifp || !(ifp->drvr) || WARN_ON(ifp->drvr->iflist[ifp->bsscfgidx] != ifp)) { + brcmf_err("Invalid interface or driver\n"); return; - brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", ifp->bsscfgidx, - ifp->ifidx); + } + brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", ifp->bsscfgidx, ifp->ifidx); brcmf_proto_del_if(ifp->drvr, ifp); brcmf_del_if(ifp->drvr, ifp->bsscfgidx, locked); } -- 2.25.1