Skip to contentSkip to conversation

brcmfmac: Fix fallback logic to use firmware's canonical path

PATCH In review [email protected] 2 participants 2 messages Aug 12, 2021 – Aug 13, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 brcmfmac: Fix fallback logic to use firmware's canonical path

From: Tom Rix <[email protected]>

Static analysis reports this problem
firmware.c:709:6: warning: Branch condition evaluates to a garbage value

        if (ret) {
            ^~~

In brcmf_fw_get_firmwares(), ret is only set if the alt_path control flow is taken. Initialize ret to -1, so the canonical path is taken if alt_path is not.

Fixes 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware binaries")
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +1 -1
index adfdfc654b104..e11f1a3a38a59 100644
@@ -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 = -1;
 
 	brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
 	if (!fw_cb)
Signature · 1 line
2.26.3
#1 lore raw
Quoted 7 lines · On Thu, Aug 12, 2021 at 7:03 PM <[email protected]> wrote:

From: Tom Rix <[email protected]>

Static analysis reports this problem
firmware.c:709:6: warning: Branch condition evaluates to a garbage value

        if (ret) {
            ^~~
Quoted 6 lines

In brcmf_fw_get_firmwares(), ret is only set if the alt_path control flow is taken. Initialize ret to -1, so the canonical path is taken if alt_path is not.

Fixes 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware binaries")

Thanks!

But we are working on a more generic solution to this and other problems in a patch that Dmitry has asked Kalle to merge.
https://lore.kernel.org/linux-wireless/[email protected]/

Yours,
Linus Walleij