2021-08-03 15:10:53

by Colin King

[permalink] [raw]
Subject: [PATCH][next] brcmfmac: firmware: Fix uninitialized variable ret

From: Colin Ian King <[email protected]>

Currently the variable ret is uninitialized and is only set if
the pointer alt_path is non-null. Fix this by ininitializing ret
to zero.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware binaries")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
index adfdfc654b10..4f387e868120 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -680,7 +680,7 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,
struct brcmf_fw_item *first = &req->items[0];
struct brcmf_fw *fwctx;
char *alt_path;
- int ret;
+ int ret = 0;

brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
if (!fw_cb)
--
2.31.1



2021-08-03 19:19:41

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH][next] brcmfmac: firmware: Fix uninitialized variable ret

On Tue, Aug 3, 2021 at 5:09 PM Colin King <[email protected]> wrote:

> From: Colin Ian King <[email protected]>
>
> Currently the variable ret is uninitialized and is only set if
> the pointer alt_path is non-null. Fix this by ininitializing ret
> to zero.
>
> Addresses-Coverity: ("Uninitialized scalar variable")
> Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware binaries")
> Signed-off-by: Colin Ian King <[email protected]>

Nice catch!
Reviewed-by: Linus Walleij <[email protected]>

Yours,
Linus Walleij

2021-08-05 14:46:18

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH][next] brcmfmac: firmware: Fix uninitialized variable ret

Linus Walleij <[email protected]> writes:

> On Tue, Aug 3, 2021 at 5:09 PM Colin King <[email protected]> wrote:
>
>> From: Colin Ian King <[email protected]>
>>
>> Currently the variable ret is uninitialized and is only set if
>> the pointer alt_path is non-null. Fix this by ininitializing ret
>> to zero.
>>
>> Addresses-Coverity: ("Uninitialized scalar variable")
>> Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware binaries")
>> Signed-off-by: Colin Ian King <[email protected]>
>
> Nice catch!
> Reviewed-by: Linus Walleij <[email protected]>

I assume this will be fixed by Linus' patch "brcmfmac: firmware: Fix
firmware loading" and I should drop Colin's patch, correct?

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2021-08-06 15:31:04

by Arend van Spriel

[permalink] [raw]
Subject: Re: [PATCH][next] brcmfmac: firmware: Fix uninitialized variable ret

On 05-08-2021 15:53, Kalle Valo wrote:
> Linus Walleij <[email protected]> writes:
>
>> On Tue, Aug 3, 2021 at 5:09 PM Colin King <[email protected]> wrote:
>>
>>> From: Colin Ian King <[email protected]>
>>>
>>> Currently the variable ret is uninitialized and is only set if
>>> the pointer alt_path is non-null. Fix this by ininitializing ret
>>> to zero.
>>>
>>> Addresses-Coverity: ("Uninitialized scalar variable")
>>> Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware binaries")
>>> Signed-off-by: Colin Ian King <[email protected]>
>>
>> Nice catch!
>> Reviewed-by: Linus Walleij <[email protected]>
>
> I assume this will be fixed by Linus' patch "brcmfmac: firmware: Fix
> firmware loading" and I should drop Colin's patch, correct?

That would be my assumption as well, but not sure when he will submit
another revision of it. You probably know what to do ;-)

Regards,
Arend

2021-08-06 15:38:18

by Colin King

[permalink] [raw]
Subject: Re: [PATCH][next] brcmfmac: firmware: Fix uninitialized variable ret

On 06/08/2021 12:23, Arend van Spriel wrote:
> On 05-08-2021 15:53, Kalle Valo wrote:
>> Linus Walleij <[email protected]> writes:
>>
>>> On Tue, Aug 3, 2021 at 5:09 PM Colin King <[email protected]>
>>> wrote:
>>>
>>>> From: Colin Ian King <[email protected]>
>>>>
>>>> Currently the variable ret is uninitialized and is only set if
>>>> the pointer alt_path is non-null. Fix this by ininitializing ret
>>>> to zero.
>>>>
>>>> Addresses-Coverity: ("Uninitialized scalar variable")
>>>> Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware
>>>> binaries")
>>>> Signed-off-by: Colin Ian King <[email protected]>
>>>
>>> Nice catch!
>>> Reviewed-by: Linus Walleij <[email protected]>
>>
>> I assume this will be fixed by Linus' patch "brcmfmac: firmware: Fix
>> firmware loading" and I should drop Colin's patch, correct?
>
> That would be my assumption as well, but not sure when he will submit
> another revision of it. You probably know what to do ;-)

I'd prefer my patch to be dropped in preference to Linus' fix.

>
> Regards,
> Arend

2021-08-06 16:27:53

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH][next] brcmfmac: firmware: Fix uninitialized variable ret

Colin Ian King <[email protected]> writes:

> On 06/08/2021 12:23, Arend van Spriel wrote:
>> On 05-08-2021 15:53, Kalle Valo wrote:
>>> Linus Walleij <[email protected]> writes:
>>>
>>>> On Tue, Aug 3, 2021 at 5:09 PM Colin King <[email protected]>
>>>> wrote:
>>>>
>>>>> From: Colin Ian King <[email protected]>
>>>>>
>>>>> Currently the variable ret is uninitialized and is only set if
>>>>> the pointer alt_path is non-null. Fix this by ininitializing ret
>>>>> to zero.
>>>>>
>>>>> Addresses-Coverity: ("Uninitialized scalar variable")
>>>>> Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware
>>>>> binaries")
>>>>> Signed-off-by: Colin Ian King <[email protected]>
>>>>
>>>> Nice catch!
>>>> Reviewed-by: Linus Walleij <[email protected]>
>>>
>>> I assume this will be fixed by Linus' patch "brcmfmac: firmware: Fix
>>> firmware loading" and I should drop Colin's patch, correct?
>>
>> That would be my assumption as well, but not sure when he will submit
>> another revision of it. You probably know what to do ;-)
>
> I'd prefer my patch to be dropped in preference to Linus' fix.

Ok, I'll then drop Colin's patch.

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches