lkml.org 
[lkml]   [2021]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.15 06/39] mac80211: do not access the IV when it was stripped
    Date
    From: Xing Song <xing.song@mediatek.com>

    [ Upstream commit 77dfc2bc0bb4b8376ecd7a430f27a4a8fff6a5a0 ]

    ieee80211_get_keyid() will return false value if IV has been stripped,
    such as return 0 for IP/ARP frames due to LLC header, and return -EINVAL
    for disassociation frames due to its length... etc. Don't try to access
    it if it's not present.

    Signed-off-by: Xing Song <xing.song@mediatek.com>
    Link: https://lore.kernel.org/r/20211101024657.143026-1-xing.song@mediatek.com
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/rx.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
    index c4071b015c188..ba3b82a72a604 100644
    --- a/net/mac80211/rx.c
    +++ b/net/mac80211/rx.c
    @@ -1952,7 +1952,8 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
    int keyid = rx->sta->ptk_idx;
    sta_ptk = rcu_dereference(rx->sta->ptk[keyid]);

    - if (ieee80211_has_protected(fc)) {
    + if (ieee80211_has_protected(fc) &&
    + !(status->flag & RX_FLAG_IV_STRIPPED)) {
    cs = rx->sta->cipher_scheme;
    keyid = ieee80211_get_keyid(rx->skb, cs);

    --
    2.33.0
    \
     
     \ /
      Last update: 2021-11-26 03:35    [W:4.062 / U:0.528 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site