]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Drop mac80211-always-wind-down-sta-state.patch
authorSasha Levin <sashal@kernel.org>
Tue, 17 Nov 2020 16:44:06 +0000 (11:44 -0500)
committerSasha Levin <sashal@kernel.org>
Tue, 17 Nov 2020 16:44:06 +0000 (11:44 -0500)
Signed-off-by: Sasha Levin <sashal@kernel.org>
12 files changed:
queue-4.14/mac80211-always-wind-down-sta-state.patch [deleted file]
queue-4.14/series
queue-4.19/mac80211-always-wind-down-sta-state.patch [deleted file]
queue-4.19/series
queue-4.4/mac80211-always-wind-down-sta-state.patch [deleted file]
queue-4.4/series
queue-4.9/mac80211-always-wind-down-sta-state.patch [deleted file]
queue-4.9/series
queue-5.4/mac80211-always-wind-down-sta-state.patch [deleted file]
queue-5.4/series
queue-5.9/mac80211-always-wind-down-sta-state.patch [deleted file]
queue-5.9/series

diff --git a/queue-4.14/mac80211-always-wind-down-sta-state.patch b/queue-4.14/mac80211-always-wind-down-sta-state.patch
deleted file mode 100644 (file)
index 3c22782..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 8838804cec52e504cabd75b926d238f82c87c65f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Oct 2020 14:17:11 +0200
-Subject: mac80211: always wind down STA state
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit dcd479e10a0510522a5d88b29b8f79ea3467d501 ]
-
-When (for example) an IBSS station is pre-moved to AUTHORIZED
-before it's inserted, and then the insertion fails, we don't
-clean up the fast RX/TX states that might already have been
-created, since we don't go through all the state transitions
-again on the way down.
-
-Do that, if it hasn't been done already, when the station is
-freed. I considered only freeing the fast TX/RX state there,
-but we might add more state so it's more robust to wind down
-the state properly.
-
-Note that we warn if the station was ever inserted, it should
-have been properly cleaned up in that case, and the driver
-will probably not like things happening out of order.
-
-Reported-by: syzbot+2e293dbd67de2836ba42@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/20201009141710.7223b322a955.I95bd08b9ad0e039c034927cce0b75beea38e059b@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/sta_info.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
-index 2a18687019003..b74551323f5fb 100644
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -244,6 +244,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
-  */
- void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
- {
-+      /*
-+       * If we had used sta_info_pre_move_state() then we might not
-+       * have gone through the state transitions down again, so do
-+       * it here now (and warn if it's inserted).
-+       *
-+       * This will clear state such as fast TX/RX that may have been
-+       * allocated during state transitions.
-+       */
-+      while (sta->sta_state > IEEE80211_STA_NONE) {
-+              int ret;
-+
-+              WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
-+
-+              ret = sta_info_move_state(sta, sta->sta_state - 1);
-+              if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret))
-+                      break;
-+      }
-+
-       if (sta->rate_ctrl)
-               rate_control_free_sta(sta);
--- 
-2.27.0
-
index d0918c079ac89c0b95107a5061c5b47c053f6e35..43a0a5650047faf60273331b30a537cefe625de8 100644 (file)
@@ -27,7 +27,6 @@ gfs2-check-for-live-vs.-read-only-file-system-in-gfs.patch
 scsi-hpsa-fix-memory-leak-in-hpsa_init_one.patch
 drm-amdgpu-perform-srbm-soft-reset-always-on-sdma-re.patch
 mac80211-fix-use-of-skb-payload-instead-of-header.patch
-mac80211-always-wind-down-sta-state.patch
 cfg80211-regulatory-fix-inconsistent-format-argument.patch
 scsi-scsi_dh_alua-avoid-crash-during-alua_bus_detach.patch
 iommu-amd-increase-interrupt-remapping-table-limit-t.patch
diff --git a/queue-4.19/mac80211-always-wind-down-sta-state.patch b/queue-4.19/mac80211-always-wind-down-sta-state.patch
deleted file mode 100644 (file)
index 176f566..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 4a5c7469e7d809dc4b44294831f6d0efe00b03d1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Oct 2020 14:17:11 +0200
-Subject: mac80211: always wind down STA state
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit dcd479e10a0510522a5d88b29b8f79ea3467d501 ]
-
-When (for example) an IBSS station is pre-moved to AUTHORIZED
-before it's inserted, and then the insertion fails, we don't
-clean up the fast RX/TX states that might already have been
-created, since we don't go through all the state transitions
-again on the way down.
-
-Do that, if it hasn't been done already, when the station is
-freed. I considered only freeing the fast TX/RX state there,
-but we might add more state so it's more robust to wind down
-the state properly.
-
-Note that we warn if the station was ever inserted, it should
-have been properly cleaned up in that case, and the driver
-will probably not like things happening out of order.
-
-Reported-by: syzbot+2e293dbd67de2836ba42@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/20201009141710.7223b322a955.I95bd08b9ad0e039c034927cce0b75beea38e059b@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/sta_info.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
-index 9968b8a976f19..d11eb5139c92a 100644
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -244,6 +244,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
-  */
- void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
- {
-+      /*
-+       * If we had used sta_info_pre_move_state() then we might not
-+       * have gone through the state transitions down again, so do
-+       * it here now (and warn if it's inserted).
-+       *
-+       * This will clear state such as fast TX/RX that may have been
-+       * allocated during state transitions.
-+       */
-+      while (sta->sta_state > IEEE80211_STA_NONE) {
-+              int ret;
-+
-+              WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
-+
-+              ret = sta_info_move_state(sta, sta->sta_state - 1);
-+              if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret))
-+                      break;
-+      }
-+
-       if (sta->rate_ctrl)
-               rate_control_free_sta(sta);
--- 
-2.27.0
-
index e944bea76d3fa7036bb5d654944400bdbab45504..835b263d5b5ff754a6ec556e3815b17ed2c9509c 100644 (file)
@@ -37,7 +37,6 @@ drm-amdgpu-perform-srbm-soft-reset-always-on-sdma-re.patch
 drm-amd-pm-perform-smc-reset-on-suspend-hibernation.patch
 drm-amd-pm-do-not-use-ixfeature_status-for-checking-.patch
 mac80211-fix-use-of-skb-payload-instead-of-header.patch
-mac80211-always-wind-down-sta-state.patch
 cfg80211-regulatory-fix-inconsistent-format-argument.patch
 scsi-scsi_dh_alua-avoid-crash-during-alua_bus_detach.patch
 iommu-amd-increase-interrupt-remapping-table-limit-t.patch
diff --git a/queue-4.4/mac80211-always-wind-down-sta-state.patch b/queue-4.4/mac80211-always-wind-down-sta-state.patch
deleted file mode 100644 (file)
index b0e2347..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2e39c206d0aa7ccf9288a5787c71fc83589cd499 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Oct 2020 14:17:11 +0200
-Subject: mac80211: always wind down STA state
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit dcd479e10a0510522a5d88b29b8f79ea3467d501 ]
-
-When (for example) an IBSS station is pre-moved to AUTHORIZED
-before it's inserted, and then the insertion fails, we don't
-clean up the fast RX/TX states that might already have been
-created, since we don't go through all the state transitions
-again on the way down.
-
-Do that, if it hasn't been done already, when the station is
-freed. I considered only freeing the fast TX/RX state there,
-but we might add more state so it's more robust to wind down
-the state properly.
-
-Note that we warn if the station was ever inserted, it should
-have been properly cleaned up in that case, and the driver
-will probably not like things happening out of order.
-
-Reported-by: syzbot+2e293dbd67de2836ba42@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/20201009141710.7223b322a955.I95bd08b9ad0e039c034927cce0b75beea38e059b@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/sta_info.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
-index bbddab248c489..6f7c3f6a5027b 100644
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -242,6 +242,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
-  */
- void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
- {
-+      /*
-+       * If we had used sta_info_pre_move_state() then we might not
-+       * have gone through the state transitions down again, so do
-+       * it here now (and warn if it's inserted).
-+       *
-+       * This will clear state such as fast TX/RX that may have been
-+       * allocated during state transitions.
-+       */
-+      while (sta->sta_state > IEEE80211_STA_NONE) {
-+              int ret;
-+
-+              WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
-+
-+              ret = sta_info_move_state(sta, sta->sta_state - 1);
-+              if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret))
-+                      break;
-+      }
-+
-       if (sta->rate_ctrl)
-               rate_control_free_sta(sta);
--- 
-2.27.0
-
index ebf5ff2db52e17cf705e35596172a19e4599f224..9798025c3d2aa9af9ae92e200fb61405d6951bc1 100644 (file)
@@ -22,7 +22,6 @@ gfs2-free-rd_bits-later-in-gfs2_clear_rgrpd-to-fix-u.patch
 gfs2-check-for-live-vs.-read-only-file-system-in-gfs.patch
 drm-amdgpu-perform-srbm-soft-reset-always-on-sdma-re.patch
 mac80211-fix-use-of-skb-payload-instead-of-header.patch
-mac80211-always-wind-down-sta-state.patch
 cfg80211-regulatory-fix-inconsistent-format-argument.patch
 iommu-amd-increase-interrupt-remapping-table-limit-t.patch
 xfs-fix-a-missing-unlock-on-error-in-xfs_fs_map_bloc.patch
diff --git a/queue-4.9/mac80211-always-wind-down-sta-state.patch b/queue-4.9/mac80211-always-wind-down-sta-state.patch
deleted file mode 100644 (file)
index 8233bc7..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 6e9e508939e98e0864159eae78ff372104b75a62 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Oct 2020 14:17:11 +0200
-Subject: mac80211: always wind down STA state
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit dcd479e10a0510522a5d88b29b8f79ea3467d501 ]
-
-When (for example) an IBSS station is pre-moved to AUTHORIZED
-before it's inserted, and then the insertion fails, we don't
-clean up the fast RX/TX states that might already have been
-created, since we don't go through all the state transitions
-again on the way down.
-
-Do that, if it hasn't been done already, when the station is
-freed. I considered only freeing the fast TX/RX state there,
-but we might add more state so it's more robust to wind down
-the state properly.
-
-Note that we warn if the station was ever inserted, it should
-have been properly cleaned up in that case, and the driver
-will probably not like things happening out of order.
-
-Reported-by: syzbot+2e293dbd67de2836ba42@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/20201009141710.7223b322a955.I95bd08b9ad0e039c034927cce0b75beea38e059b@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/sta_info.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
-index fef8d7758dae9..8a9bbcfefbca6 100644
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -243,6 +243,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
-  */
- void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
- {
-+      /*
-+       * If we had used sta_info_pre_move_state() then we might not
-+       * have gone through the state transitions down again, so do
-+       * it here now (and warn if it's inserted).
-+       *
-+       * This will clear state such as fast TX/RX that may have been
-+       * allocated during state transitions.
-+       */
-+      while (sta->sta_state > IEEE80211_STA_NONE) {
-+              int ret;
-+
-+              WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
-+
-+              ret = sta_info_move_state(sta, sta->sta_state - 1);
-+              if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret))
-+                      break;
-+      }
-+
-       if (sta->rate_ctrl)
-               rate_control_free_sta(sta);
--- 
-2.27.0
-
index 288633cf2b35578197fee7521c63726159508f9f..b89b40be11018508e7d795e78e570b32042baeda 100644 (file)
@@ -29,7 +29,6 @@ gfs2-check-for-live-vs.-read-only-file-system-in-gfs.patch
 scsi-hpsa-fix-memory-leak-in-hpsa_init_one.patch
 drm-amdgpu-perform-srbm-soft-reset-always-on-sdma-re.patch
 mac80211-fix-use-of-skb-payload-instead-of-header.patch
-mac80211-always-wind-down-sta-state.patch
 cfg80211-regulatory-fix-inconsistent-format-argument.patch
 scsi-scsi_dh_alua-avoid-crash-during-alua_bus_detach.patch
 iommu-amd-increase-interrupt-remapping-table-limit-t.patch
diff --git a/queue-5.4/mac80211-always-wind-down-sta-state.patch b/queue-5.4/mac80211-always-wind-down-sta-state.patch
deleted file mode 100644 (file)
index ad7a96f..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 4651bb2a027c959b45ec3fe620db40baf47ad2f5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Oct 2020 14:17:11 +0200
-Subject: mac80211: always wind down STA state
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit dcd479e10a0510522a5d88b29b8f79ea3467d501 ]
-
-When (for example) an IBSS station is pre-moved to AUTHORIZED
-before it's inserted, and then the insertion fails, we don't
-clean up the fast RX/TX states that might already have been
-created, since we don't go through all the state transitions
-again on the way down.
-
-Do that, if it hasn't been done already, when the station is
-freed. I considered only freeing the fast TX/RX state there,
-but we might add more state so it's more robust to wind down
-the state properly.
-
-Note that we warn if the station was ever inserted, it should
-have been properly cleaned up in that case, and the driver
-will probably not like things happening out of order.
-
-Reported-by: syzbot+2e293dbd67de2836ba42@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/20201009141710.7223b322a955.I95bd08b9ad0e039c034927cce0b75beea38e059b@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/sta_info.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
-index 4f14d8a06915a..38bb6d512b36d 100644
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -244,6 +244,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
-  */
- void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
- {
-+      /*
-+       * If we had used sta_info_pre_move_state() then we might not
-+       * have gone through the state transitions down again, so do
-+       * it here now (and warn if it's inserted).
-+       *
-+       * This will clear state such as fast TX/RX that may have been
-+       * allocated during state transitions.
-+       */
-+      while (sta->sta_state > IEEE80211_STA_NONE) {
-+              int ret;
-+
-+              WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
-+
-+              ret = sta_info_move_state(sta, sta->sta_state - 1);
-+              if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret))
-+                      break;
-+      }
-+
-       if (sta->rate_ctrl)
-               rate_control_free_sta(sta);
--- 
-2.27.0
-
index 85f0c844fc7fa22c09700f18c38640d53e4c235c..0282643f2ceee5e5ff5d92b30056c0fbbcf921a1 100644 (file)
@@ -61,7 +61,6 @@ drm-amd-pm-perform-smc-reset-on-suspend-hibernation.patch
 drm-amd-pm-do-not-use-ixfeature_status-for-checking-.patch
 mac80211-fix-use-of-skb-payload-instead-of-header.patch
 cfg80211-initialize-wdev-data-earlier.patch
-mac80211-always-wind-down-sta-state.patch
 cfg80211-regulatory-fix-inconsistent-format-argument.patch
 tracing-fix-the-checking-of-stackidx-in-__ftrace_tra.patch
 scsi-scsi_dh_alua-avoid-crash-during-alua_bus_detach.patch
diff --git a/queue-5.9/mac80211-always-wind-down-sta-state.patch b/queue-5.9/mac80211-always-wind-down-sta-state.patch
deleted file mode 100644 (file)
index 1cfd0de..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 294d3cf1f74513ca42906ed9243c9f43bffb7034 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Oct 2020 14:17:11 +0200
-Subject: mac80211: always wind down STA state
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit dcd479e10a0510522a5d88b29b8f79ea3467d501 ]
-
-When (for example) an IBSS station is pre-moved to AUTHORIZED
-before it's inserted, and then the insertion fails, we don't
-clean up the fast RX/TX states that might already have been
-created, since we don't go through all the state transitions
-again on the way down.
-
-Do that, if it hasn't been done already, when the station is
-freed. I considered only freeing the fast TX/RX state there,
-but we might add more state so it's more robust to wind down
-the state properly.
-
-Note that we warn if the station was ever inserted, it should
-have been properly cleaned up in that case, and the driver
-will probably not like things happening out of order.
-
-Reported-by: syzbot+2e293dbd67de2836ba42@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/20201009141710.7223b322a955.I95bd08b9ad0e039c034927cce0b75beea38e059b@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/sta_info.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
-index fb4f2b9b294f0..4fe284ff1ea3d 100644
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -258,6 +258,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
-  */
- void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
- {
-+      /*
-+       * If we had used sta_info_pre_move_state() then we might not
-+       * have gone through the state transitions down again, so do
-+       * it here now (and warn if it's inserted).
-+       *
-+       * This will clear state such as fast TX/RX that may have been
-+       * allocated during state transitions.
-+       */
-+      while (sta->sta_state > IEEE80211_STA_NONE) {
-+              int ret;
-+
-+              WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
-+
-+              ret = sta_info_move_state(sta, sta->sta_state - 1);
-+              if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret))
-+                      break;
-+      }
-+
-       if (sta->rate_ctrl)
-               rate_control_free_sta(sta);
--- 
-2.27.0
-
index 51e80a652777f66ae928a0c284960d9936325a2d..c4bef2dfe8f37ef2390fb8afc102dc3126087fe4 100644 (file)
@@ -96,7 +96,6 @@ drm-amd-pm-perform-smc-reset-on-suspend-hibernation.patch
 drm-amd-pm-do-not-use-ixfeature_status-for-checking-.patch
 mac80211-fix-use-of-skb-payload-instead-of-header.patch
 cfg80211-initialize-wdev-data-earlier.patch
-mac80211-always-wind-down-sta-state.patch
 cfg80211-regulatory-fix-inconsistent-format-argument.patch
 wireguard-selftests-check-that-route_me_harder-packe.patch
 tracing-fix-the-checking-of-stackidx-in-__ftrace_tra.patch