lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0473/1157] wifi: mac80211: reject WEP or pairwise keys with key ID > 3
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 92ea8df110b8ca92f9664ec7bd76dea109115348 ]

    We don't really care too much right now since our data
    structures are set up to not have a problem with this,
    but clearly it's wrong to accept WEP and pairwise keys
    with key ID > 3.

    However, with MLD we need to split into per-link (GTK,
    IGTK, BIGTK) and per interface/MLD (including WEP) keys
    so make sure this is not a problem.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/key.c | 18 +++++++++++++-----
    1 file changed, 13 insertions(+), 5 deletions(-)

    diff --git a/net/mac80211/key.c b/net/mac80211/key.c
    index 0fcf8aebedc4..047a06b857c9 100644
    --- a/net/mac80211/key.c
    +++ b/net/mac80211/key.c
    @@ -433,13 +433,25 @@ static int ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
    int idx;
    int ret = 0;
    bool defunikey, defmultikey, defmgmtkey, defbeaconkey;
    + bool is_wep;

    /* caller must provide at least one old/new */
    if (WARN_ON(!new && !old))
    return 0;

    - if (new)
    + if (new) {
    + idx = new->conf.keyidx;
    list_add_tail_rcu(&new->list, &sdata->key_list);
    + is_wep = new->conf.cipher == WLAN_CIPHER_SUITE_WEP40 ||
    + new->conf.cipher == WLAN_CIPHER_SUITE_WEP104;
    + } else {
    + idx = old->conf.keyidx;
    + is_wep = old->conf.cipher == WLAN_CIPHER_SUITE_WEP40 ||
    + old->conf.cipher == WLAN_CIPHER_SUITE_WEP104;
    + }
    +
    + if ((is_wep || pairwise) && idx >= NUM_DEFAULT_KEYS)
    + return -EINVAL;

    WARN_ON(new && old && new->conf.keyidx != old->conf.keyidx);

    @@ -451,8 +463,6 @@ static int ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
    }

    if (old) {
    - idx = old->conf.keyidx;
    -
    if (old->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
    ieee80211_key_disable_hw_accel(old);

    @@ -460,8 +470,6 @@ static int ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
    ret = ieee80211_key_enable_hw_accel(new);
    }
    } else {
    - /* new must be provided in case old is not */
    - idx = new->conf.keyidx;
    if (!new->local->wowlan)
    ret = ieee80211_key_enable_hw_accel(new);
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 01:56    [W:2.552 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site