* [PATCH][next] ath11k: avoid null pointer dereference when pointer band is null
@ 2020-01-11 9:08 Colin King
2020-01-26 10:48 ` Kalle Valo
0 siblings, 1 reply; 5+ messages in thread
From: Colin King @ 2020-01-11 9:08 UTC (permalink / raw)
To: Kalle Valo, David S . Miller, John Crispin,
Shashidhar Lakkavalli, ath11k, linux-wireless, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
In the unlikely event that cap->supported_bands has neither
WMI_HOST_WLAN_2G_CAP set or WMI_HOST_WLAN_5G_CAP set then pointer
band is null and a null dereference occurs when assigning
band->n_iftype_data. Move the assignment to the if blocks to
avoid this. Cleans up static analysis warnings.
Addresses-Coverity: ("Explicit null dereference")
Fixes: 9f056ed8ee01 ("ath11k: add HE support")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/wireless/ath/ath11k/mac.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 556eef9881a7..4a364cfe37ed 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -3520,8 +3520,8 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar,
static void ath11k_mac_setup_he_cap(struct ath11k *ar,
struct ath11k_pdev_cap *cap)
{
- struct ieee80211_supported_band *band = NULL;
- int count = 0;
+ struct ieee80211_supported_band *band;
+ int count;
if (cap->supported_bands & WMI_HOST_WLAN_2G_CAP) {
count = ath11k_mac_copy_he_cap(ar, cap,
@@ -3529,6 +3529,7 @@ static void ath11k_mac_setup_he_cap(struct ath11k *ar,
NL80211_BAND_2GHZ);
band = &ar->mac.sbands[NL80211_BAND_2GHZ];
band->iftype_data = ar->mac.iftype[NL80211_BAND_2GHZ];
+ band->n_iftype_data = count;
}
if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP) {
@@ -3537,9 +3538,8 @@ static void ath11k_mac_setup_he_cap(struct ath11k *ar,
NL80211_BAND_5GHZ);
band = &ar->mac.sbands[NL80211_BAND_5GHZ];
band->iftype_data = ar->mac.iftype[NL80211_BAND_5GHZ];
+ band->n_iftype_data = count;
}
-
- band->n_iftype_data = count;
}
static int __ath11k_set_antenna(struct ath11k *ar, u32 tx_ant, u32 rx_ant)
--
2.24.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH][next] ath11k: avoid null pointer dereference when pointer band is null
2020-01-11 9:08 [PATCH][next] ath11k: avoid null pointer dereference when pointer band is null Colin King
@ 2020-01-26 10:48 ` Kalle Valo
0 siblings, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2020-01-26 10:48 UTC (permalink / raw)
To: Colin King
Cc: David S . Miller, John Crispin, Shashidhar Lakkavalli, ath11k,
linux-wireless, netdev, kernel-janitors, linux-kernel
Colin King <colin.king@canonical.com> wrote:
> In the unlikely event that cap->supported_bands has neither
> WMI_HOST_WLAN_2G_CAP set or WMI_HOST_WLAN_5G_CAP set then pointer
> band is null and a null dereference occurs when assigning
> band->n_iftype_data. Move the assignment to the if blocks to
> avoid this. Cleans up static analysis warnings.
>
> Addresses-Coverity: ("Explicit null dereference")
> Fixes: 9f056ed8ee01 ("ath11k: add HE support")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Patch applied to ath-next branch of ath.git, thanks.
3b4516838eaa ath11k: avoid null pointer dereference when pointer band is null
--
https://patchwork.kernel.org/patch/11328755/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][next] ath11k: avoid null pointer dereference when pointer band is null
2020-01-11 11:57 ` Marion & Christophe JAILLET
@ 2020-01-13 8:47 ` Dan Carpenter
0 siblings, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2020-01-13 8:47 UTC (permalink / raw)
To: Marion & Christophe JAILLET
Cc: Colin King, David Miller, linux-wireless, netdev,
Kernel Janitors, linux-kernel
On Sat, Jan 11, 2020 at 12:57:11PM +0100, Marion & Christophe JAILLET wrote:
> Le 11/01/2020 à 10:50, linmiaohe a écrit :
> > Colin Ian King<colin.king@canonical.com> wrote:
> > > From: Colin Ian King<colin.king@canonical.com>
> > >
> > > In the unlikely event that cap->supported_bands has neither WMI_HOST_WLAN_2G_CAP set or WMI_HOST_WLAN_5G_CAP set then pointer band is null and a null dereference occurs when assigning
> > > band->n_iftype_data. Move the assignment to the if blocks to
> > > avoid this. Cleans up static analysis warnings.
> > >
> > > Addresses-Coverity: ("Explicit null dereference")
> > > Fixes: 9f056ed8ee01 ("ath11k: add HE support")
> > > Signed-off-by: Colin Ian King<colin.king@canonical.com>
> > > ---
> > > drivers/net/wireless/ath/ath11k/mac.c | 8 ++++----
> > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > It looks fine for me. Thanks.
> > Reviewed-by: Miaohe Lin<linmiaohe@huawei.com>
> (sorry for incomplete mail and mailing list addresses, my newsreader ate
> them, and I cannot get the list from get_maintainer.pl because my (outdated)
> tree does not have ath11k/...
> I've only including the ones in memory of my mail writer.
>
> Please forward if needed)
>
>
> Hi
>
> Shouldn't there be a
>
> |
>
> - band->n_iftype_data = count; at the end of the patch if the assignment
> is *moved*? Without it, 'band' (as well as 'count') could be un-initialized,
> and lead to memory corruption. Just my 2c. CJ |
You must be looking at different code. There is no uninitialized
variable. The patched code looks like:
drivers/net/wireless/ath/ath11k/mac.c
3520 static void ath11k_mac_setup_he_cap(struct ath11k *ar,
3521 struct ath11k_pdev_cap *cap)
3522 {
3523 struct ieee80211_supported_band *band;
3524 int count;
3525
3526 if (cap->supported_bands & WMI_HOST_WLAN_2G_CAP) {
3527 count = ath11k_mac_copy_he_cap(ar, cap,
3528 ar->mac.iftype[NL80211_BAND_2GHZ],
3529 NL80211_BAND_2GHZ);
3530 band = &ar->mac.sbands[NL80211_BAND_2GHZ];
3531 band->iftype_data = ar->mac.iftype[NL80211_BAND_2GHZ];
3532 band->n_iftype_data = count;
3533 }
3534
3535 if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP) {
3536 count = ath11k_mac_copy_he_cap(ar, cap,
3537 ar->mac.iftype[NL80211_BAND_5GHZ],
3538 NL80211_BAND_5GHZ);
3539 band = &ar->mac.sbands[NL80211_BAND_5GHZ];
3540 band->iftype_data = ar->mac.iftype[NL80211_BAND_5GHZ];
3541 band->n_iftype_data = count;
3542 }
3543 }
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][next] ath11k: avoid null pointer dereference when pointer band is null
[not found] ` <64797126-0c77-4c2c-ad2b-29d7af452c13@wanadoo.fr>
@ 2020-01-11 11:57 ` Marion & Christophe JAILLET
2020-01-13 8:47 ` Dan Carpenter
0 siblings, 1 reply; 5+ messages in thread
From: Marion & Christophe JAILLET @ 2020-01-11 11:57 UTC (permalink / raw)
To: Colin King
Cc: David Miller, linux-wireless, netdev, Kernel Janitors, linux-kernel
Le 11/01/2020 à 10:50, linmiaohe a écrit :
> Colin Ian King<colin.king@canonical.com> wrote:
>> From: Colin Ian King<colin.king@canonical.com>
>>
>> In the unlikely event that cap->supported_bands has neither WMI_HOST_WLAN_2G_CAP set or WMI_HOST_WLAN_5G_CAP set then pointer band is null and a null dereference occurs when assigning
>> band->n_iftype_data. Move the assignment to the if blocks to
>> avoid this. Cleans up static analysis warnings.
>>
>> Addresses-Coverity: ("Explicit null dereference")
>> Fixes: 9f056ed8ee01 ("ath11k: add HE support")
>> Signed-off-by: Colin Ian King<colin.king@canonical.com>
>> ---
>> drivers/net/wireless/ath/ath11k/mac.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
> It looks fine for me. Thanks.
> Reviewed-by: Miaohe Lin<linmiaohe@huawei.com>
(sorry for incomplete mail and mailing list addresses, my newsreader ate
them, and I cannot get the list from get_maintainer.pl because my
(outdated) tree does not have ath11k/...
I've only including the ones in memory of my mail writer.
Please forward if needed)
Hi
Shouldn't there be a
|
- band->n_iftype_data = count; at the end of the patch if the assignment is *moved*? Without it,
'band' (as well as 'count') could be un-initialized, and lead to memory
corruption. Just my 2c. CJ |
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][next] ath11k: avoid null pointer dereference when pointer band is null
@ 2020-01-11 9:50 linmiaohe
[not found] ` <64797126-0c77-4c2c-ad2b-29d7af452c13@wanadoo.fr>
0 siblings, 1 reply; 5+ messages in thread
From: linmiaohe @ 2020-01-11 9:50 UTC (permalink / raw)
To: Colin King
Cc: Kalle Valo, David S . Miller, John Crispin,
Shashidhar Lakkavalli, ath11k, linux-wireless, netdev,
kernel-janitors, linux-kernel
Colin Ian King <colin.king@canonical.com> wrote:
>From: Colin Ian King <colin.king@canonical.com>
>
>In the unlikely event that cap->supported_bands has neither WMI_HOST_WLAN_2G_CAP set or WMI_HOST_WLAN_5G_CAP set then pointer band is null and a null dereference occurs when assigning
>band->n_iftype_data. Move the assignment to the if blocks to
>avoid this. Cleans up static analysis warnings.
>
>Addresses-Coverity: ("Explicit null dereference")
>Fixes: 9f056ed8ee01 ("ath11k: add HE support")
>Signed-off-by: Colin Ian King <colin.king@canonical.com>
>---
> drivers/net/wireless/ath/ath11k/mac.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
It looks fine for me. Thanks.
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-26 10:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-11 9:08 [PATCH][next] ath11k: avoid null pointer dereference when pointer band is null Colin King
2020-01-26 10:48 ` Kalle Valo
2020-01-11 9:50 linmiaohe
[not found] ` <64797126-0c77-4c2c-ad2b-29d7af452c13@wanadoo.fr>
2020-01-11 11:57 ` Marion & Christophe JAILLET
2020-01-13 8:47 ` Dan Carpenter
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).