lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 21/61] nl80211: Fix possible Spectre-v1 for NL80211_TXRATE_HT
    Date
    From: Masashi Honma <masashi.honma@gmail.com>

    [ Upstream commit 30fe6d50eb088783c8729c7d930f65296b2b3fa7 ]

    Use array_index_nospec() to sanitize ridx with respect to speculation.

    Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/wireless/nl80211.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
    index 3de415bca391..5e7c9b361e8a 100644
    --- a/net/wireless/nl80211.c
    +++ b/net/wireless/nl80211.c
    @@ -3480,6 +3480,7 @@ static bool ht_rateset_to_mask(struct ieee80211_supported_band *sband,
    return false;

    /* check availability */
    + ridx = array_index_nospec(ridx, IEEE80211_HT_MCS_MASK_LEN);
    if (sband->ht_cap.mcs.rx_mask[ridx] & rbit)
    mcs[ridx] |= rbit;
    else
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-16 06:56    [W:3.136 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site