lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 063/700] mac80211: fix NULL ptr dereference during mesh peer connection for non HE devices
    Date
    From: Abinaya Kalaiselvan <akalaise@codeaurora.org>

    commit 95f83ee8d857f006813755e89a126f1048b001e8 upstream.

    "sband->iftype_data" is not assigned with any value for non HE supported
    devices, which causes NULL pointer access during mesh peer connection
    in those devices. Fix this by accessing the pointer after HE
    capabilities condition check.

    Cc: stable@vger.kernel.org
    Fixes: 7f7aa94bcaf0 (mac80211: reduce peer HE MCS/NSS to own capabilities)
    Signed-off-by: Abinaya Kalaiselvan <akalaise@codeaurora.org>
    Link: https://lore.kernel.org/r/1624459244-4497-1-git-send-email-akalaise@codeaurora.org
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/he.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/net/mac80211/he.c
    +++ b/net/mac80211/he.c
    @@ -111,7 +111,7 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct
    struct sta_info *sta)
    {
    struct ieee80211_sta_he_cap *he_cap = &sta->sta.he_cap;
    - struct ieee80211_sta_he_cap own_he_cap = sband->iftype_data->he_cap;
    + struct ieee80211_sta_he_cap own_he_cap;
    struct ieee80211_he_cap_elem *he_cap_ie_elem = (void *)he_cap_ie;
    u8 he_ppe_size;
    u8 mcs_nss_size;
    @@ -123,6 +123,8 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct
    if (!he_cap_ie || !ieee80211_get_he_sta_cap(sband))
    return;

    + own_he_cap = sband->iftype_data->he_cap;
    +
    /* Make sure size is OK */
    mcs_nss_size = ieee80211_he_mcs_nss_size(he_cap_ie_elem);
    he_ppe_size =

    \
     
     \ /
      Last update: 2021-07-12 09:40    [W:2.912 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site