From: Sasha Levin Date: Mon, 7 Jun 2021 23:48:10 +0000 (-0400) Subject: Drop netfilter-conntrack-unregister-ipv4-sockopts-on-erro.patch from 4.19 X-Git-Tag: v4.4.272~79 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d2173b0de5f234fb6b08ac0cbfe1ce5e9b7355a;p=thirdparty%2Fkernel%2Fstable-queue.git Drop netfilter-conntrack-unregister-ipv4-sockopts-on-erro.patch from 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/netfilter-conntrack-unregister-ipv4-sockopts-on-erro.patch b/queue-4.19/netfilter-conntrack-unregister-ipv4-sockopts-on-erro.patch deleted file mode 100644 index 0197e568974..00000000000 --- a/queue-4.19/netfilter-conntrack-unregister-ipv4-sockopts-on-erro.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a8123341aee02e0463bdc3ab75a7c2a3483af096 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 4 May 2021 16:40:00 +0200 -Subject: netfilter: conntrack: unregister ipv4 sockopts on error unwind - -From: Florian Westphal - -[ Upstream commit 22cbdbcfb61acc78d5fc21ebb13ccc0d7e29f793 ] - -When ipv6 sockopt register fails, the ipv4 one needs to be removed. - -Fixes: a0ae2562c6c ("netfilter: conntrack: remove l3proto abstraction") -Signed-off-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_conntrack_proto.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c -index e903ef9b96cf..478212bec4cd 100644 ---- a/net/netfilter/nf_conntrack_proto.c -+++ b/net/netfilter/nf_conntrack_proto.c -@@ -962,7 +962,7 @@ cleanup_sockopt2: - nf_unregister_sockopt(&so_getorigdst); - #if IS_ENABLED(CONFIG_IPV6) - cleanup_sockopt: -- nf_unregister_sockopt(&so_getorigdst6); -+ nf_unregister_sockopt(&so_getorigdst); - #endif - return ret; - } --- -2.30.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 9f75887dd1e..5509f63c0f4 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -1,7 +1,6 @@ net-usb-cdc_ncm-don-t-spew-notifications.patch alsa-usb-update-old-style-static-const-declaration.patch nl80211-validate-key-indexes-for-cfg80211_registered.patch -netfilter-conntrack-unregister-ipv4-sockopts-on-erro.patch efi-allow-efi_memory_xp-and-efi_memory_ro-both-to-be.patch efi-cper-fix-snprintf-use-in-cper_dimm_err_location.patch vfio-pci-fix-error-return-code-in-vfio_ecap_init.patch