From 828db0db527d576f6ab764656148f4ea04277fec Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 25 Feb 2022 13:49:44 +0100 Subject: [PATCH] remove pending patches that are queued up --- ...cket-fix-a-typo-in-socket_mt_destroy.patch | 34 ------------------- ...cket-fix-a-typo-in-socket_mt_destroy.patch | 34 ------------------- 2 files changed, 68 deletions(-) delete mode 100644 pending/5.15/netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch delete mode 100644 pending/5.16/netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch diff --git a/pending/5.15/netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch b/pending/5.15/netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch deleted file mode 100644 index 7f478952f23..00000000000 --- a/pending/5.15/netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 75063c9294fb239bbe64eb72141b6871fe526d29 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Tue, 8 Feb 2022 18:30:43 -0800 -Subject: netfilter: xt_socket: fix a typo in socket_mt_destroy() - -From: Eric Dumazet - -commit 75063c9294fb239bbe64eb72141b6871fe526d29 upstream. - -Calling nf_defrag_ipv4_disable() instead of nf_defrag_ipv6_disable() -was probably not the intent. - -I found this by code inspection, while chasing a possible issue in TPROXY. - -Fixes: de8c12110a13 ("netfilter: disable defrag once its no longer needed") -Signed-off-by: Eric Dumazet -Reviewed-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Greg Kroah-Hartman ---- - net/netfilter/xt_socket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/net/netfilter/xt_socket.c -+++ b/net/netfilter/xt_socket.c -@@ -221,7 +221,7 @@ static void socket_mt_destroy(const stru - if (par->family == NFPROTO_IPV4) - nf_defrag_ipv4_disable(par->net); - else if (par->family == NFPROTO_IPV6) -- nf_defrag_ipv4_disable(par->net); -+ nf_defrag_ipv6_disable(par->net); - } - - static struct xt_match socket_mt_reg[] __read_mostly = { diff --git a/pending/5.16/netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch b/pending/5.16/netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch deleted file mode 100644 index 7f478952f23..00000000000 --- a/pending/5.16/netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 75063c9294fb239bbe64eb72141b6871fe526d29 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Tue, 8 Feb 2022 18:30:43 -0800 -Subject: netfilter: xt_socket: fix a typo in socket_mt_destroy() - -From: Eric Dumazet - -commit 75063c9294fb239bbe64eb72141b6871fe526d29 upstream. - -Calling nf_defrag_ipv4_disable() instead of nf_defrag_ipv6_disable() -was probably not the intent. - -I found this by code inspection, while chasing a possible issue in TPROXY. - -Fixes: de8c12110a13 ("netfilter: disable defrag once its no longer needed") -Signed-off-by: Eric Dumazet -Reviewed-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Greg Kroah-Hartman ---- - net/netfilter/xt_socket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/net/netfilter/xt_socket.c -+++ b/net/netfilter/xt_socket.c -@@ -221,7 +221,7 @@ static void socket_mt_destroy(const stru - if (par->family == NFPROTO_IPV4) - nf_defrag_ipv4_disable(par->net); - else if (par->family == NFPROTO_IPV6) -- nf_defrag_ipv4_disable(par->net); -+ nf_defrag_ipv6_disable(par->net); - } - - static struct xt_match socket_mt_reg[] __read_mostly = { -- 2.47.3