diff mbox series

wifi: ath12k: sanitize ath12k_mac_allocate() return code

Message ID 20240213100912.459018-1-arnd@kernel.org
State New
Headers
Series wifi: ath12k: sanitize ath12k_mac_allocate() return code |

Commit Message

Arnd Bergmann Feb. 13, 2024, 10:09 a.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

The return code has no initializer:

drivers/net/wireless/ath/ath12k/mac.c:8006:9: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]

Make it return -ENOMEM for allocation failures and remove the unused
variable instead.

Fixes: 6db6e70a17f6 ("wifi: ath12k: Introduce the container for mac80211 hw")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/wireless/ath/ath12k/mac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Kalle Valo Feb. 14, 2024, 8:44 a.m. UTC | #1 
Arnd Bergmann <arnd@kernel.org> wrote:

> The return code has no initializer:
> 
> drivers/net/wireless/ath/ath12k/mac.c:8006:9: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
> 
> Make it return -ENOMEM for allocation failures and remove the unused
> variable instead.
> 
> Fixes: 6db6e70a17f6 ("wifi: ath12k: Introduce the container for mac80211 hw")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

Nathan already fixed this:

https://git.kernel.org/kvalo/ath/c/04edb5dc68f4

Patch set to Rejected.
Arnd Bergmann Feb. 14, 2024, 10:37 a.m. UTC | #2 
On Wed, Feb 14, 2024, at 09:44, Kalle Valo wrote:
> Arnd Bergmann <arnd@kernel.org> wrote:
>
>> The return code has no initializer:
>> 
>> drivers/net/wireless/ath/ath12k/mac.c:8006:9: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
>> 
>> Make it return -ENOMEM for allocation failures and remove the unused
>> variable instead.
>> 
>> Fixes: 6db6e70a17f6 ("wifi: ath12k: Introduce the container for mac80211 hw")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
>
> Nathan already fixed this:
>
> https://git.kernel.org/kvalo/ath/c/04edb5dc68f4
>
> Patch set to Rejected.

Ok, sounds good. Nathan's patch looks fine to me, but
I see it's not in linux-next yet as of today.

     Arnd
Kalle Valo Feb. 14, 2024, 10:44 a.m. UTC | #3 
"Arnd Bergmann" <arnd@arndb.de> writes:

> On Wed, Feb 14, 2024, at 09:44, Kalle Valo wrote:
>> Arnd Bergmann <arnd@kernel.org> wrote:
>>
>>> The return code has no initializer:
>>> 
>>> drivers/net/wireless/ath/ath12k/mac.c:8006:9: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
>>> 
>>> Make it return -ENOMEM for allocation failures and remove the unused
>>> variable instead.
>>> 
>>> Fixes: 6db6e70a17f6 ("wifi: ath12k: Introduce the container for mac80211 hw")
>>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>>> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
>>
>> Nathan already fixed this:
>>
>> https://git.kernel.org/kvalo/ath/c/04edb5dc68f4
>>
>> Patch set to Rejected.
>
> Ok, sounds good. Nathan's patch looks fine to me

Great, thanks for checking.

> but I see it's not in linux-next yet as of today.

Yeah, it's a problem that ath.git is not included linux-next builds. The
commits will be in linux-next only after ath-next is pulled to
wireless-next :/
Arnd Bergmann Feb. 14, 2024, 10:51 a.m. UTC | #4 
On Wed, Feb 14, 2024, at 11:44, Kalle Valo wrote:
> "Arnd Bergmann" <arnd@arndb.de> writes:
>> On Wed, Feb 14, 2024, at 09:44, Kalle Valo wrote:
>>> Arnd Bergmann <arnd@kernel.org> wrote:
>
>> but I see it's not in linux-next yet as of today.
>
> Yeah, it's a problem that ath.git is not included linux-next builds. The
> commits will be in linux-next only after ath-next is pulled to
> wireless-next :/

Not sure if that is intentional, but if you'd like to change
that, you can just email Stephen Rothwell asking him to include
ath-next into linux-next as well.

      Arnd
Kalle Valo Feb. 14, 2024, 12:21 p.m. UTC | #5 
"Arnd Bergmann" <arnd@arndb.de> writes:

> On Wed, Feb 14, 2024, at 11:44, Kalle Valo wrote:
>> "Arnd Bergmann" <arnd@arndb.de> writes:
>>> On Wed, Feb 14, 2024, at 09:44, Kalle Valo wrote:
>>>> Arnd Bergmann <arnd@kernel.org> wrote:
>>
>>> but I see it's not in linux-next yet as of today.
>>
>> Yeah, it's a problem that ath.git is not included linux-next builds. The
>> commits will be in linux-next only after ath-next is pulled to
>> wireless-next :/
>
> Not sure if that is intentional, but if you'd like to change
> that, you can just email Stephen Rothwell asking him to include
> ath-next into linux-next as well.

We haven't done that as Stephen prefers that there are no "next-next"
patches in linux-next during the merge window and we don't want to stop
the development for two weeks.

But this is not the first time we get duplicate fixes due to the first
fix not being in linux-next, so we should fix this. I guess we could do
a similar for-next branch trick like we have in wireless-next? I'll talk
with Jeff and we'll see what we can do.
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index f2f7b2a60261..e93475ae8d07 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -7965,7 +7965,7 @@  int ath12k_mac_allocate(struct ath12k_base *ab)
 {
 	struct ath12k_hw *ah;
 	struct ath12k_pdev_map pdev_map[MAX_RADIOS];
-	int ret, i, j;
+	int i, j;
 	u8 radio_per_hw;
 
 	if (test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags))
@@ -8003,5 +8003,5 @@  int ath12k_mac_allocate(struct ath12k_base *ab)
 		ab->ah[i] = NULL;
 	}
 
-	return ret;
+	return -ENOMEM;
 }