lkml.org 
[lkml]   [2018]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 090/228] brcmsmac: fix wrap around in conversion from constant to s16
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stefan Agner <stefan@agner.ch>

    [ Upstream commit c9a61469fc97672a08b2f798830a55ea6e03dc4a ]

    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>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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 */

    \
     
     \ /
      Last update: 2018-10-02 16:09    [W:2.525 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site