Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df19e777 authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: fix NULL pointer access in brcmf_fweh_detach() 



brcmf_fweh_detach can be called while ifp is already NULL, due to
init error. Fix NULL pointer access by checking ifp.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0b63cb71

drivers/net/wireless/brcm80211/brcmfmac/fweh.c

+7 −5
Original line number Diff line number Diff line
@@ -374,11 +374,13 @@ void brcmf_fweh_detach(struct brcmf_pub *drvr) 
	struct brcmf_if *ifp = drvr->iflist[0];

	s8 eventmask[BRCMF_EVENTING_MASK_LEN];



	if (ifp) {

		/* clear all events */

		memset(eventmask, 0, BRCMF_EVENTING_MASK_LEN);

		(void)brcmf_fil_iovar_data_set(ifp, "event_msgs",

				       eventmask, BRCMF_EVENTING_MASK_LEN);



					       eventmask,

					       BRCMF_EVENTING_MASK_LEN);

	}

	/* cancel the worker */

	cancel_work_sync(&fweh->event_work);

	WARN_ON(!list_empty(&fweh->event_q));