package/kernel/mac80211/patches/377-brcmfmac-only-lock-and-unlock-fws-if-fws-is-not-null.patch

   1 From: Colin Ian King <colin.king@canonical.com>
   2 Date: Wed, 2 Dec 2015 11:45:10 +0000
   3 Subject: [PATCH] brcmfmac: only lock and unlock fws if fws is not null
   4
   5 There is a null ptr check for fws to set bcmc_credit_check, however,
   6 there a lock and unlock on fws should only performed if fwts is
   7 also not null to also avoid a potential null pointer deference.
   8
   9 Signed-off-by: Colin Ian King <colin.king@canonical.com>
  10 Acked-by: Arend van Spriel <arend@broadcom.com>
  11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  12 ---
  13
  14 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
  15 +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
  16 @@ -1609,10 +1609,11 @@ static int brcmf_fws_notify_bcmc_credit_
  17  {
  18         struct brcmf_fws_info *fws = ifp->drvr->fws;
  19
  20 -       brcmf_fws_lock(fws);
  21 -       if (fws)
  22 +       if (fws) {
  23 +               brcmf_fws_lock(fws);
  24                 fws->bcmc_credit_check = true;
  25 -       brcmf_fws_unlock(fws);
  26 +               brcmf_fws_unlock(fws);
  27 +       }
  28         return 0;
  29  }
  30