| Message ID | 20180617103407.27819-1-stefan@agner.ch (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c9a61469fc97672a08b2f798830a55ea6e03dc4a |
| Delegated to: | Kalle Valo |
| Headers | show |
Stefan Agner <stefan@agner.ch> wrote: > The last value in the log_table wraps around to a negative value > since s16 has a value range of -32768 to 32767. This is not what > the table intends to represent. Use the closest positive value > 32767. > > This fixes a warning seen with clang: > drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c:216:2: warning: > implicit conversion from 'int' to 's16' (aka 'short') changes > value from 32768 > to -32768 [-Wconstant-conversion] > 32768 > ^~~~~ > 1 warning generated. > > Fixes: 4c0bfeaae9f9 ("brcmsmac: fix array out-of-bounds access in qm_log10") > Cc: Tobias Regnery <tobias.regnery@gmail.com> > Signed-off-by: Stefan Agner <stefan@agner.ch> Patch applied to wireless-drivers-next.git, thanks. c9a61469fc97 brcmsmac: fix wrap around in conversion from constant to s16
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c index b9672da24a9d..b24bc57ca91b 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c @@ -213,7 +213,7 @@ static const s16 log_table[] = { 30498, 31267, 32024, - 32768 + 32767 }; #define LOG_TABLE_SIZE 32 /* log_table size */
The last value in the log_table wraps around to a negative value since s16 has a value range of -32768 to 32767. This is not what the table intends to represent. Use the closest positive value 32767. This fixes a warning seen with clang: drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c:216:2: warning: implicit conversion from 'int' to 's16' (aka 'short') changes value from 32768 to -32768 [-Wconstant-conversion] 32768 ^~~~~ 1 warning generated. Fixes: 4c0bfeaae9f9 ("brcmsmac: fix array out-of-bounds access in qm_log10") Cc: Tobias Regnery <tobias.regnery@gmail.com> Signed-off-by: Stefan Agner <stefan@agner.ch> --- .../net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)