lkml.org 
[lkml]   [2024]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.6 11/22] wifi: mac80211: fix prep_connection error path
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 2e6bd24339a6ff04413b2e49c0f2672d6f0edfa5 ]

    If prep_channel fails in prep_connection, the code releases
    the deflink's chanctx, which is wrong since we may be using
    a different link. It's already wrong to even do that always
    though, since we might still have the station. Remove it
    only if prep_channel succeeded and later updates fail.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
    Link: https://msgid.link/20240318184907.2780c1f08c3d.I033c9b15483933088f32a2c0789612a33dd33d82@changeid
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/mlme.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
    index c6044ab4e7fc1..5739556443833 100644
    --- a/net/mac80211/mlme.c
    +++ b/net/mac80211/mlme.c
    @@ -7077,7 +7077,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
    sdata_info(sdata,
    "failed to insert STA entry for the AP (error %d)\n",
    err);
    - goto out_err;
    + goto out_release_chan;
    }
    } else
    WARN_ON_ONCE(!ether_addr_equal(link->u.mgd.bssid, cbss->bssid));
    @@ -7088,8 +7088,9 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,

    return 0;

    +out_release_chan:
    + ieee80211_link_release_channel(link);
    out_err:
    - ieee80211_link_release_channel(&sdata->deflink);
    ieee80211_vif_set_links(sdata, 0, 0);
    return err;
    }
    --
    2.43.0

    \
     
     \ /
      Last update: 2024-05-27 16:27    [W:2.937 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site