* [PATCH] brcmfmac: only lock and unlock fws if fws is not null
@ 2015-12-02 11:45 Colin King
2015-12-02 13:03 ` Arend van Spriel
2015-12-11 11:14 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2015-12-02 11:45 UTC (permalink / raw)
To: kernel-tram, Brett Rudley, Arend van Spriel, Franky Lin,
Hante Meuleman, Kalle Valo, Pieter-Paul Giesberts, Arnd Bergmann,
linux-wireless, brcm80211-dev-list, netdev
Cc: linux-kernel
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(-)
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;
}
--
2.6.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] brcmfmac: only lock and unlock fws if fws is not null
2015-12-02 11:45 [PATCH] brcmfmac: only lock and unlock fws if fws is not null Colin King
@ 2015-12-02 13:03 ` Arend van Spriel
2015-12-11 11:14 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Arend van Spriel @ 2015-12-02 13:03 UTC (permalink / raw)
To: Colin King, kernel-tram, Brett Rudley, Franky Lin, Hante Meuleman,
Kalle Valo, Pieter-Paul Giesberts, Arnd Bergmann, linux-wireless,
brcm80211-dev-list, netdev
Cc: linux-kernel
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;
> }
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: brcmfmac: only lock and unlock fws if fws is not null
2015-12-02 11:45 [PATCH] brcmfmac: only lock and unlock fws if fws is not null Colin King
2015-12-02 13:03 ` Arend van Spriel
@ 2015-12-11 11:14 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2015-12-11 11:14 UTC (permalink / raw)
To: Colin Ian King
Cc: kernel-tram, Brett Rudley, Arend van Spriel, Franky Lin,
Hante Meuleman, Pieter-Paul Giesberts, Arnd Bergmann,
linux-wireless, brcm80211-dev-list, netdev, linux-kernel
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-11 11:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-02 11:45 [PATCH] brcmfmac: only lock and unlock fws if fws is not null Colin King
2015-12-02 13:03 ` Arend van Spriel
2015-12-11 11:14 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).