]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
b43: fix a lower bounds test
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 6 Oct 2021 07:36:22 +0000 (10:36 +0300)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:22 +0000 (09:48 +0100)
BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit 9b793db5fca44d01f72d3564a168171acf7c4076 ]

The problem is that "channel" is an unsigned int, when it's less 5 the
value of "channel - 5" is not a negative number as one would expect but
is very high positive value instead.

This means that "start" becomes a very high positive value.  The result
of that is that we never enter the "for (i = start; i <= end; i++) {"
loop.  Instead of storing the result from b43legacy_radio_aci_detect()
it just uses zero.

Fixes: ef1a628d83fc ("b43: Implement dynamic PHY API")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Michael Büsch <m@bues.ch>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211006073621.GE8404@kili
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/net/wireless/broadcom/b43/phy_g.c

index d5a1a5c582366e30e4d2946df3b9dc1e800fe5ce..ac72ca39e409b29eee5250256b803a1ab313617e 100644 (file)
@@ -2297,7 +2297,7 @@ static u8 b43_gphy_aci_scan(struct b43_wldev *dev)
        b43_phy_mask(dev, B43_PHY_G_CRS, 0x7FFF);
        b43_set_all_gains(dev, 3, 8, 1);
 
-       start = (channel - 5 > 0) ? channel - 5 : 1;
+       start = (channel > 5) ? channel - 5 : 1;
        end = (channel + 5 < 14) ? channel + 5 : 13;
 
        for (i = start; i <= end; i++) {