drop queue-5.10/net-xfrm-fix-shift-out-of-bounds-in-xfrm_get_default.patch

diff --git a/queue-5.10/net-xfrm-fix-shift-out-of-bounds-in-xfrm_get_default.patch b/queue-5.10/net-xfrm-fix-shift-out-of-bounds-in-xfrm_get_default.patch
deleted file mode 100644 (file)
index f93d036..0000000
--- a/queue-5.10/net-xfrm-fix-shift-out-of-bounds-in-xfrm_get_default.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3c10ffddc61f8a1a59e29a110ba70b47e679206a Mon Sep 17 00:00:00 2001
-From: Pavel Skripkin <paskripkin@gmail.com>
-Date: Thu, 2 Sep 2021 22:04:00 +0300
-Subject: net: xfrm: fix shift-out-of-bounds in xfrm_get_default
-
-From: Pavel Skripkin <paskripkin@gmail.com>
-
-commit 3c10ffddc61f8a1a59e29a110ba70b47e679206a upstream.
-
-Syzbot hit shift-out-of-bounds in xfrm_get_default. The problem was in
-missing validation check for user data.
-
-up->dirmask comes from user-space, so we need to check if this value
-is less than XFRM_USERPOLICY_DIRMASK_MAX to avoid shift-out-of-bounds bugs.
-
-Fixes: 2d151d39073a ("xfrm: Add possibility to set the default to block if we have no policy")
-Reported-and-tested-by: syzbot+b2be9dd8ca6f6c73ee2d@syzkaller.appspotmail.com
-Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
-Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/xfrm/xfrm_user.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/net/xfrm/xfrm_user.c
-+++ b/net/xfrm/xfrm_user.c
-@@ -1989,6 +1989,11 @@ static int xfrm_get_default(struct sk_bu
-               return -EMSGSIZE;
-       }
- 
-+      if (up->dirmask >= XFRM_USERPOLICY_DIRMASK_MAX) {
-+              kfree_skb(r_skb);
-+              return -EINVAL;
-+      }
-+
-       r_up = nlmsg_data(r_nlh);
-       r_up->in = net->xfrm.policy_default[XFRM_POLICY_IN];
-       r_up->fwd = net->xfrm.policy_default[XFRM_POLICY_FWD];

diff --git a/queue-5.10/series b/queue-5.10/series
index ac1366527a489a58ebfcde017a39bbc20b3b1f55..81b048bf06db860906fe1e3e98680a92bdf6f09d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -93,6 +93,5 @@ dt-bindings-pinctrl-aspeed-g6-remove-fwqspid-group.patch
 module-treat-exit-sections-the-same-as-init-sections-when-config_module_unload.patch
 i2c-mt7621-fix-missing-clk_disable_unprepare-on-erro.patch
 afs-fix-afs_getattr-to-refetch-file-status-if-callba.patch
-net-xfrm-fix-shift-out-of-bounds-in-xfrm_get_default.patch
 include-uapi-linux-xfrm.h-fix-xfrm_msg_mapping-abi-breakage.patch
 module-check-for-exit-sections-in-layout_sections-instead-of-module_init_section.patch