]> git.itanic.dy.fi Git - linux-stable/commitdiff
mac80211: fix misplaced while instead of if
authorJohannes Berg <johannes.berg@intel.com>
Mon, 3 Aug 2020 09:02:10 +0000 (11:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 07:48:18 +0000 (09:48 +0200)
commit 5981fe5b0529ba25d95f37d7faa434183ad618c5 upstream.

This never was intended to be a 'while' loop, it should've
just been an 'if' instead of 'while'. Fix this.

I noticed this while applying another patch from Ben that
intended to fix a busy loop at this spot.

Cc: stable@vger.kernel.org
Fixes: b16798f5b907 ("mac80211: mark station unauthorized before key removal")
Reported-by: Ben Greear <greearb@candelatech.com>
Link: https://lore.kernel.org/r/20200803110209.253009ae41ff.I3522aad099392b31d5cf2dcca34cbac7e5832dde@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/mac80211/sta_info.c

index 77ab9cc1a230a133df254d14145462b7f024c05f..6af5fda6461ce8d6f4a3dff5dd7716a4de9b4bbe 100644 (file)
@@ -952,7 +952,7 @@ static void __sta_info_destroy_part2(struct sta_info *sta)
        might_sleep();
        lockdep_assert_held(&local->sta_mtx);
 
-       while (sta->sta_state == IEEE80211_STA_AUTHORIZED) {
+       if (sta->sta_state == IEEE80211_STA_AUTHORIZED) {
                ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
                WARN_ON_ONCE(ret);
        }