diff mbox

brcmfmac: only lock and unlock fws if fws is not null

Message ID 1449056710-9776-1-git-send-email-colin.king@canonical.com (mailing list archive)
State Accepted
Delegated to: Kalle Valo
Headers show

Commit Message

Colin King Dec. 2, 2015, 11:45 a.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

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.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Arend van Spriel Dec. 2, 2015, 1:03 p.m. UTC | #1 
On 12/02/2015 12:45 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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 <arend@broadcom.com>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   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;
>   }
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Dec. 11, 2015, 11:14 a.m. UTC | #2 
> From: Colin Ian King <colin.king@canonical.com>
> 
> 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.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> Acked-by: Arend van Spriel <arend@broadcom.com>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;
 }