Return-path: Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:51490 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932180AbbLBNDp (ORCPT ); Wed, 2 Dec 2015 08:03:45 -0500 Message-ID: <565EEC2C.7030501@broadcom.com> (sfid-20151202_140404_707278_E530CA92) Date: Wed, 2 Dec 2015 14:03:40 +0100 From: Arend van Spriel MIME-Version: 1.0 To: Colin King , , Brett Rudley , Franky Lin , Hante Meuleman , Kalle Valo , Pieter-Paul Giesberts , Arnd Bergmann , , , CC: Subject: Re: [PATCH] brcmfmac: only lock and unlock fws if fws is not null References: <1449056710-9776-1-git-send-email-colin.king@canonical.com> In-Reply-To: <1449056710-9776-1-git-send-email-colin.king@canonical.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On 12/02/2015 12:45 PM, Colin King wrote: > From: Colin Ian King > > There is a null ptr check for fws to set bcmc_credit_check, however, > there a lock and unlock on fws should only performed if fwts is > also not null to also avoid a potential null pointer deference. Acked-by: Arend van Spriel > Signed-off-by: Colin Ian King > --- > drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c > index 086cac3..092f33f 100644 > --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c > +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c > @@ -1609,10 +1609,11 @@ static int brcmf_fws_notify_bcmc_credit_support(struct brcmf_if *ifp, > { > struct brcmf_fws_info *fws = ifp->drvr->fws; > > - brcmf_fws_lock(fws); > - if (fws) > + if (fws) { > + brcmf_fws_lock(fws); > fws->bcmc_credit_check = true; > - brcmf_fws_unlock(fws); > + brcmf_fws_unlock(fws); > + } > return 0; > } > >