Linux 5.1.21

[thirdparty/kernel/stable-queue.git] / queue-5.1 / macsec-fix-use-after-free-of-skb-during-rx.patch

diff --git a/queue-5.1/macsec-fix-use-after-free-of-skb-during-rx.patch b/queue-5.1/macsec-fix-use-after-free-of-skb-during-rx.patch
deleted file mode 100644 (file)
index b1659b2..0000000
--- a/queue-5.1/macsec-fix-use-after-free-of-skb-during-rx.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From foo@baz Fri 26 Jul 2019 10:52:07 AM CEST
-From: Andreas Steinmetz <ast@domdv.de>
-Date: Sun, 30 Jun 2019 22:46:42 +0200
-Subject: macsec: fix use-after-free of skb during RX
-
-From: Andreas Steinmetz <ast@domdv.de>
-
-[ Upstream commit 095c02da80a41cf6d311c504d8955d6d1c2add10 ]
-
-Fix use-after-free of skb when rx_handler returns RX_HANDLER_PASS.
-
-Signed-off-by: Andreas Steinmetz <ast@domdv.de>
-Acked-by: Willem de Bruijn <willemb@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/macsec.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/net/macsec.c
-+++ b/drivers/net/macsec.c
-@@ -1103,10 +1103,9 @@ static rx_handler_result_t macsec_handle
-       }
- 
-       skb = skb_unshare(skb, GFP_ATOMIC);
--      if (!skb) {
--              *pskb = NULL;
-+      *pskb = skb;
-+      if (!skb)
-               return RX_HANDLER_CONSUMED;
--      }
- 
-       pulled_sci = pskb_may_pull(skb, macsec_extra_len(true));
-       if (!pulled_sci) {