* [PATCH] qtnfmac: fix NULL pointer dereference
@ 2018-06-01 13:24 Gustavo A. R. Silva
2018-06-01 14:08 ` Sergey Matyukevich
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2018-06-01 13:24 UTC (permalink / raw)
To: Igor Mitsyanko, Avinash Patil, Sergey Matyukevich, Kalle Valo,
David S. Miller
Cc: linux-wireless, netdev, linux-kernel, Gustavo A. R. Silva,
kernel-janitors
In case *vif* is NULL at 655: if (!vif), the execution path jumps to
label out, where *vif* is dereferenced at 679:
if (vif->sta_state == QTNF_STA_CONNECTING)
Fix this by immediately returning when *vif* is NULL instead of
jumping to label out.
Addresses-Coverity-ID: 1469567 ("Dereference after null check")
Fixes: 480daa9cb62c ("qtnfmac: fix invalid STA state on EAPOL failure")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
index 220e2b7..ae0ca80 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
@@ -654,8 +654,7 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
vif = qtnf_mac_get_base_vif(mac);
if (!vif) {
pr_err("MAC%u: primary VIF is not configured\n", mac->macid);
- ret = -EFAULT;
- goto out;
+ return -EFAULT;
}
if (vif->wdev.iftype != NL80211_IFTYPE_STATION) {
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] qtnfmac: fix NULL pointer dereference
2018-06-01 13:24 [PATCH] qtnfmac: fix NULL pointer dereference Gustavo A. R. Silva
@ 2018-06-01 14:08 ` Sergey Matyukevich
2018-06-01 14:22 ` Gustavo A. R. Silva
2018-06-01 15:52 ` Kalle Valo
2018-06-18 8:55 ` Kalle Valo
2 siblings, 1 reply; 5+ messages in thread
From: Sergey Matyukevich @ 2018-06-01 14:08 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Igor Mitsyanko, Avinash Patil, Sergey Matyukevich, Kalle Valo,
David S. Miller, linux-wireless, netdev, linux-kernel,
kernel-janitors
Hello Gustavo,
> diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
> index 220e2b7..ae0ca80 100644
> --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
> +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
> @@ -654,8 +654,7 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
> vif = qtnf_mac_get_base_vif(mac);
> if (!vif) {
> pr_err("MAC%u: primary VIF is not configured\n", mac->macid);
> - ret = -EFAULT;
> - goto out;
> + return -EFAULT;
> }
>
> if (vif->wdev.iftype != NL80211_IFTYPE_STATION) {
That was my fault. Thanks for the fix!
Reviewed-by: Sergey Matyukevich <sergey.matyukevich.os@quanenna.com>
Regards,
Sergey
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qtnfmac: fix NULL pointer dereference
2018-06-01 14:08 ` Sergey Matyukevich
@ 2018-06-01 14:22 ` Gustavo A. R. Silva
0 siblings, 0 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2018-06-01 14:22 UTC (permalink / raw)
To: Igor Mitsyanko, Avinash Patil, Sergey Matyukevich, Kalle Valo,
David S. Miller, linux-wireless, netdev, linux-kernel,
kernel-janitors
Hi Sergey,
On 06/01/2018 09:08 AM, Sergey Matyukevich wrote:
> Hello Gustavo,
>
>> diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
>> index 220e2b7..ae0ca80 100644
>> --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
>> +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
>> @@ -654,8 +654,7 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
>> vif = qtnf_mac_get_base_vif(mac);
>> if (!vif) {
>> pr_err("MAC%u: primary VIF is not configured\n", mac->macid);
>> - ret = -EFAULT;
>> - goto out;
>> + return -EFAULT;
>> }
>>
>> if (vif->wdev.iftype != NL80211_IFTYPE_STATION) {
>
> That was my fault. Thanks for the fix!
>
Glad to help. :)
> Reviewed-by: Sergey Matyukevich <sergey.matyukevich.os@quanenna.com>
>
Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qtnfmac: fix NULL pointer dereference
2018-06-01 13:24 [PATCH] qtnfmac: fix NULL pointer dereference Gustavo A. R. Silva
2018-06-01 14:08 ` Sergey Matyukevich
@ 2018-06-01 15:52 ` Kalle Valo
2018-06-18 8:55 ` Kalle Valo
2 siblings, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2018-06-01 15:52 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Igor Mitsyanko, Avinash Patil, Sergey Matyukevich,
David S. Miller, linux-wireless, netdev, linux-kernel,
kernel-janitors
"Gustavo A. R. Silva" <gustavo@embeddedor.com> writes:
> In case *vif* is NULL at 655: if (!vif), the execution path jumps to
> label out, where *vif* is dereferenced at 679:
>
> if (vif->sta_state == QTNF_STA_CONNECTING)
>
> Fix this by immediately returning when *vif* is NULL instead of
> jumping to label out.
>
> Addresses-Coverity-ID: 1469567 ("Dereference after null check")
> Fixes: 480daa9cb62c ("qtnfmac: fix invalid STA state on EAPOL failure")
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
As commit 480daa9cb62c was recently applied to wireless-drivers-next
I'll queue this to 4.18.
--
Kalle Valo
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: qtnfmac: fix NULL pointer dereference
2018-06-01 13:24 [PATCH] qtnfmac: fix NULL pointer dereference Gustavo A. R. Silva
2018-06-01 14:08 ` Sergey Matyukevich
2018-06-01 15:52 ` Kalle Valo
@ 2018-06-18 8:55 ` Kalle Valo
2 siblings, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2018-06-18 8:55 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Igor Mitsyanko, Avinash Patil, Sergey Matyukevich,
David S. Miller, linux-wireless, netdev, linux-kernel,
Gustavo A. R. Silva, kernel-janitors
"Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
> In case *vif* is NULL at 655: if (!vif), the execution path jumps to
> label out, where *vif* is dereferenced at 679:
>
> if (vif->sta_state == QTNF_STA_CONNECTING)
>
> Fix this by immediately returning when *vif* is NULL instead of
> jumping to label out.
>
> Addresses-Coverity-ID: 1469567 ("Dereference after null check")
> Fixes: 480daa9cb62c ("qtnfmac: fix invalid STA state on EAPOL failure")
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> Reviewed-by: Sergey Matyukevich <sergey.matyukevich.os@quanenna.com>
Patch applied to wireless-drivers.git, thanks.
c1e3f64f8738 qtnfmac: fix NULL pointer dereference
--
https://patchwork.kernel.org/patch/10443507/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-06-18 8:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-01 13:24 [PATCH] qtnfmac: fix NULL pointer dereference Gustavo A. R. Silva
2018-06-01 14:08 ` Sergey Matyukevich
2018-06-01 14:22 ` Gustavo A. R. Silva
2018-06-01 15:52 ` Kalle Valo
2018-06-18 8:55 ` 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).