drop mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch

diff --git a/queue-4.14/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch b/queue-4.14/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
deleted file mode 100644 (file)
index 8ec98be..0000000
--- a/queue-4.14/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ce2e1ca703071723ca2dd94d492a5ab6d15050da Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Thu, 26 Mar 2020 15:51:34 +0100
-Subject: mac80211: Check port authorization in the ieee80211_tx_dequeue() case
-
-From: Jouni Malinen <jouni@codeaurora.org>
-
-commit ce2e1ca703071723ca2dd94d492a5ab6d15050da upstream.
-
-mac80211 used to check port authorization in the Data frame enqueue case
-when going through start_xmit(). However, that authorization status may
-change while the frame is waiting in a queue. Add a similar check in the
-dequeue case to avoid sending previously accepted frames after
-authorization change. This provides additional protection against
-potential leaking of frames after a station has been disconnected and
-the keys for it are being removed.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Link: https://lore.kernel.org/r/20200326155133.ced84317ea29.I34d4c47cd8cc8a4042b38a76f16a601fbcbfd9b3@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/mac80211/tx.c |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -3451,8 +3451,25 @@ begin:
-       tx.skb = skb;
-       tx.sdata = vif_to_sdata(info->control.vif);
- 
--      if (txq->sta)
-+      if (txq->sta) {
-               tx.sta = container_of(txq->sta, struct sta_info, sta);
-+              /*
-+               * Drop unicast frames to unauthorised stations unless they are
-+               * EAPOL frames from the local station.
-+               */
-+              if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
-+                           tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
-+                           !is_multicast_ether_addr(hdr->addr1) &&
-+                           !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
-+                           (!(info->control.flags &
-+                              IEEE80211_TX_CTRL_PORT_CTRL_PROTO) ||
-+                            !ether_addr_equal(tx.sdata->vif.addr,
-+                                              hdr->addr2)))) {
-+                      I802_DEBUG_INC(local->tx_handlers_drop_unauth_port);
-+                      ieee80211_free_txskb(&local->hw, skb);
-+                      goto begin;
-+              }
-+      }
- 
-       /*
-        * The key can be removed while the packet was queued, so need to call

diff --git a/queue-4.14/series b/queue-4.14/series
index fb9452300ca3f62af7926d9e6492e3500007cbf4..0b6c1504d1bd3d111ec687661138a2248281f5fc 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -95,5 +95,4 @@ perf-probe-do-not-depend-on-dwfl_module_addrsym.patch
 tools-let-o-makes-handle-a-relative-path-with-c-option.patch
 scripts-dtc-remove-redundant-yyloc-global-declaration.patch
 scsi-sd-fix-optimal-i-o-size-for-devices-that-change-reported-values.patch
-mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
 mac80211-mark-station-unauthorized-before-key-removal.patch

diff --git a/queue-4.19/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch b/queue-4.19/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
deleted file mode 100644 (file)
index 064f9cd..0000000
--- a/queue-4.19/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ce2e1ca703071723ca2dd94d492a5ab6d15050da Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Thu, 26 Mar 2020 15:51:34 +0100
-Subject: mac80211: Check port authorization in the ieee80211_tx_dequeue() case
-
-From: Jouni Malinen <jouni@codeaurora.org>
-
-commit ce2e1ca703071723ca2dd94d492a5ab6d15050da upstream.
-
-mac80211 used to check port authorization in the Data frame enqueue case
-when going through start_xmit(). However, that authorization status may
-change while the frame is waiting in a queue. Add a similar check in the
-dequeue case to avoid sending previously accepted frames after
-authorization change. This provides additional protection against
-potential leaking of frames after a station has been disconnected and
-the keys for it are being removed.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Link: https://lore.kernel.org/r/20200326155133.ced84317ea29.I34d4c47cd8cc8a4042b38a76f16a601fbcbfd9b3@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/mac80211/tx.c |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -3511,8 +3511,25 @@ begin:
-       tx.skb = skb;
-       tx.sdata = vif_to_sdata(info->control.vif);
- 
--      if (txq->sta)
-+      if (txq->sta) {
-               tx.sta = container_of(txq->sta, struct sta_info, sta);
-+              /*
-+               * Drop unicast frames to unauthorised stations unless they are
-+               * EAPOL frames from the local station.
-+               */
-+              if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
-+                           tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
-+                           !is_multicast_ether_addr(hdr->addr1) &&
-+                           !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
-+                           (!(info->control.flags &
-+                              IEEE80211_TX_CTRL_PORT_CTRL_PROTO) ||
-+                            !ether_addr_equal(tx.sdata->vif.addr,
-+                                              hdr->addr2)))) {
-+                      I802_DEBUG_INC(local->tx_handlers_drop_unauth_port);
-+                      ieee80211_free_txskb(&local->hw, skb);
-+                      goto begin;
-+              }
-+      }
- 
-       /*
-        * The key can be removed while the packet was queued, so need to call

diff --git a/queue-4.19/series b/queue-4.19/series
index d73b7e816d47f2e51bfeea5beeabb183c844f1bd..7b60fea07f198d80082b46308da8dd383b388477 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -56,5 +56,4 @@ tools-let-o-makes-handle-a-relative-path-with-c-option.patch
 scripts-dtc-remove-redundant-yyloc-global-declaration.patch
 scsi-sd-fix-optimal-i-o-size-for-devices-that-change-reported-values.patch
 nl80211-fix-nl80211_attr_channel_width-attribute-type.patch
-mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
 mac80211-mark-station-unauthorized-before-key-removal.patch

diff --git a/queue-4.9/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch b/queue-4.9/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
deleted file mode 100644 (file)
index 7947fb9..0000000
--- a/queue-4.9/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ce2e1ca703071723ca2dd94d492a5ab6d15050da Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Thu, 26 Mar 2020 15:51:34 +0100
-Subject: mac80211: Check port authorization in the ieee80211_tx_dequeue() case
-
-From: Jouni Malinen <jouni@codeaurora.org>
-
-commit ce2e1ca703071723ca2dd94d492a5ab6d15050da upstream.
-
-mac80211 used to check port authorization in the Data frame enqueue case
-when going through start_xmit(). However, that authorization status may
-change while the frame is waiting in a queue. Add a similar check in the
-dequeue case to avoid sending previously accepted frames after
-authorization change. This provides additional protection against
-potential leaking of frames after a station has been disconnected and
-the keys for it are being removed.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Link: https://lore.kernel.org/r/20200326155133.ced84317ea29.I34d4c47cd8cc8a4042b38a76f16a601fbcbfd9b3@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/mac80211/tx.c |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -3412,8 +3412,25 @@ begin:
-       tx.skb = skb;
-       tx.sdata = vif_to_sdata(info->control.vif);
- 
--      if (txq->sta)
-+      if (txq->sta) {
-               tx.sta = container_of(txq->sta, struct sta_info, sta);
-+              /*
-+               * Drop unicast frames to unauthorised stations unless they are
-+               * EAPOL frames from the local station.
-+               */
-+              if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
-+                           tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
-+                           !is_multicast_ether_addr(hdr->addr1) &&
-+                           !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
-+                           (!(info->control.flags &
-+                              IEEE80211_TX_CTRL_PORT_CTRL_PROTO) ||
-+                            !ether_addr_equal(tx.sdata->vif.addr,
-+                                              hdr->addr2)))) {
-+                      I802_DEBUG_INC(local->tx_handlers_drop_unauth_port);
-+                      ieee80211_free_txskb(&local->hw, skb);
-+                      goto begin;
-+              }
-+      }
- 
-       /*
-        * The key can be removed while the packet was queued, so need to call

diff --git a/queue-4.9/series b/queue-4.9/series
index 5470a278b285ea5849e3a7f04a44bb04c0ba986c..520ac5a2aa403621c87d493f44c03e35e9a68b84 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -61,5 +61,4 @@ arm-dts-omap5-add-bus_dma_limit-for-l3-bus.patch
 perf-probe-do-not-depend-on-dwfl_module_addrsym.patch
 scripts-dtc-remove-redundant-yyloc-global-declaration.patch
 scsi-sd-fix-optimal-i-o-size-for-devices-that-change-reported-values.patch
-mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
 mac80211-mark-station-unauthorized-before-key-removal.patch

diff --git a/queue-5.4/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch b/queue-5.4/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
deleted file mode 100644 (file)
index 2285bdf..0000000
--- a/queue-5.4/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ce2e1ca703071723ca2dd94d492a5ab6d15050da Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Thu, 26 Mar 2020 15:51:34 +0100
-Subject: mac80211: Check port authorization in the ieee80211_tx_dequeue() case
-
-From: Jouni Malinen <jouni@codeaurora.org>
-
-commit ce2e1ca703071723ca2dd94d492a5ab6d15050da upstream.
-
-mac80211 used to check port authorization in the Data frame enqueue case
-when going through start_xmit(). However, that authorization status may
-change while the frame is waiting in a queue. Add a similar check in the
-dequeue case to avoid sending previously accepted frames after
-authorization change. This provides additional protection against
-potential leaking of frames after a station has been disconnected and
-the keys for it are being removed.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Link: https://lore.kernel.org/r/20200326155133.ced84317ea29.I34d4c47cd8cc8a4042b38a76f16a601fbcbfd9b3@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/mac80211/tx.c |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -3596,8 +3596,25 @@ begin:
-       tx.skb = skb;
-       tx.sdata = vif_to_sdata(info->control.vif);
- 
--      if (txq->sta)
-+      if (txq->sta) {
-               tx.sta = container_of(txq->sta, struct sta_info, sta);
-+              /*
-+               * Drop unicast frames to unauthorised stations unless they are
-+               * EAPOL frames from the local station.
-+               */
-+              if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
-+                           tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
-+                           !is_multicast_ether_addr(hdr->addr1) &&
-+                           !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
-+                           (!(info->control.flags &
-+                              IEEE80211_TX_CTRL_PORT_CTRL_PROTO) ||
-+                            !ether_addr_equal(tx.sdata->vif.addr,
-+                                              hdr->addr2)))) {
-+                      I802_DEBUG_INC(local->tx_handlers_drop_unauth_port);
-+                      ieee80211_free_txskb(&local->hw, skb);
-+                      goto begin;
-+              }
-+      }
- 
-       /*
-        * The key can be removed while the packet was queued, so need to call

diff --git a/queue-5.4/series b/queue-5.4/series
index c47c9abe6dede6e4b700af2b52077d3e267d8b29..5e412fe402ffa907a275ffe0b6f405a5f9229dbd 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -96,7 +96,6 @@ scripts-dtc-remove-redundant-yyloc-global-declaration.patch
 scsi-sd-fix-optimal-i-o-size-for-devices-that-change-reported-values.patch
 nl80211-fix-nl80211_attr_channel_width-attribute-type.patch
 mac80211-drop-data-frames-without-key-on-encrypted-links.patch
-mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
 mac80211-mark-station-unauthorized-before-key-removal.patch
 mm-swapfile.c-move-inode_lock-out-of-claim_swapfile.patch
 drivers-base-memory.c-indicate-all-memory-blocks-as-removable.patch

diff --git a/queue-5.5/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch b/queue-5.5/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
deleted file mode 100644 (file)
index 8945a9e..0000000
--- a/queue-5.5/mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ce2e1ca703071723ca2dd94d492a5ab6d15050da Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Thu, 26 Mar 2020 15:51:34 +0100
-Subject: mac80211: Check port authorization in the ieee80211_tx_dequeue() case
-
-From: Jouni Malinen <jouni@codeaurora.org>
-
-commit ce2e1ca703071723ca2dd94d492a5ab6d15050da upstream.
-
-mac80211 used to check port authorization in the Data frame enqueue case
-when going through start_xmit(). However, that authorization status may
-change while the frame is waiting in a queue. Add a similar check in the
-dequeue case to avoid sending previously accepted frames after
-authorization change. This provides additional protection against
-potential leaking of frames after a station has been disconnected and
-the keys for it are being removed.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Link: https://lore.kernel.org/r/20200326155133.ced84317ea29.I34d4c47cd8cc8a4042b38a76f16a601fbcbfd9b3@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/mac80211/tx.c |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -3604,8 +3604,25 @@ begin:
-       tx.skb = skb;
-       tx.sdata = vif_to_sdata(info->control.vif);
- 
--      if (txq->sta)
-+      if (txq->sta) {
-               tx.sta = container_of(txq->sta, struct sta_info, sta);
-+              /*
-+               * Drop unicast frames to unauthorised stations unless they are
-+               * EAPOL frames from the local station.
-+               */
-+              if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
-+                           tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
-+                           !is_multicast_ether_addr(hdr->addr1) &&
-+                           !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
-+                           (!(info->control.flags &
-+                              IEEE80211_TX_CTRL_PORT_CTRL_PROTO) ||
-+                            !ether_addr_equal(tx.sdata->vif.addr,
-+                                              hdr->addr2)))) {
-+                      I802_DEBUG_INC(local->tx_handlers_drop_unauth_port);
-+                      ieee80211_free_txskb(&local->hw, skb);
-+                      goto begin;
-+              }
-+      }
- 
-       /*
-        * The key can be removed while the packet was queued, so need to call

diff --git a/queue-5.5/series b/queue-5.5/series
index e610a5bcb43cd6a13a4217c682ff8fe06f44c8bd..9d4c14ba6e57a732fda52461a8a39c1459f2dad2 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -107,7 +107,6 @@ soc-samsung-chipid-fix-return-value-on-non-exynos-platforms.patch
 scsi-sd-fix-optimal-i-o-size-for-devices-that-change-reported-values.patch
 nl80211-fix-nl80211_attr_channel_width-attribute-type.patch
 mac80211-drop-data-frames-without-key-on-encrypted-links.patch
-mac80211-check-port-authorization-in-the-ieee80211_tx_dequeue-case.patch
 mac80211-mark-station-unauthorized-before-key-removal.patch
 mm-swapfile.c-move-inode_lock-out-of-claim_swapfile.patch
 drivers-base-memory.c-indicate-all-memory-blocks-as-removable.patch