lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0562/1126] iwlwifi: mvm: fix off by one in iwl_mvm_stat_iterator_all_macs()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit f1cbb0a8ca9db80c086009c88c71464ac50f50a2 ]

    Change the comparison from ">" to ">=" to avoid accessing one element
    beyond the end of the ->per_mac_stats[] array.

    Fixes: 6324c173ff4a ("iwlwifi: mvm: add support for statistics update version 15")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Link: https://lore.kernel.org/r/20220106071825.GA5836@kili
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
    index 64446a11ef98..9a46468bd434 100644
    --- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
    @@ -640,7 +640,7 @@ static void iwl_mvm_stat_iterator_all_macs(void *_data, u8 *mac,
    struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
    u16 vif_id = mvmvif->id;

    - if (WARN_ONCE(vif_id > MAC_INDEX_AUX, "invalid vif id: %d", vif_id))
    + if (WARN_ONCE(vif_id >= MAC_INDEX_AUX, "invalid vif id: %d", vif_id))
    return;

    if (vif->type != NL80211_IFTYPE_STATION)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 14:46    [W:4.023 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site