2021-08-04 08:25:56

by Dan Carpenter

Subject: [PATCH] brcmfmac: uninitialized variable in brcmf_fw_get_firmwares()

The "ret" variable is used without being initialized when "alt_path" is
false.

Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware binaries")
Signed-off-by: Dan Carpenter <[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.20.1

2021-08-04 10:15:24

by Linus Walleij

Subject: Re: [PATCH] brcmfmac: uninitialized variable in brcmf_fw_get_firmwares()

On Wed, Aug 4, 2021 at 10:24 AM Dan Carpenter <[email protected]> wrote:

> The "ret" variable is used without being initialized when "alt_path" is
> false.
>
> Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware binaries")
> Signed-off-by: Dan Carpenter <[email protected]>

Thanks Dan!

But yesterday I sent another patch which incidentally fixes
this too:
https://lore.kernel.org/linux-wireless/[email protected]/T/#u

As you can see in the last hunk of that patch ret is now
unconditionally assigned on both forks of the
if/else-clause.

Yours,
Linus Walleij