]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop patch from 3.18 and 4.4
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Feb 2019 18:17:01 +0000 (19:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Feb 2019 18:17:01 +0000 (19:17 +0100)
queue-3.18/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch [deleted file]
queue-3.18/series
queue-4.4/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch [deleted file]
queue-4.4/series

diff --git a/queue-3.18/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch b/queue-3.18/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch
deleted file mode 100644 (file)
index db7cb6c..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 23b7ca4f745f21c2b9cfcb67fdd33733b3ae7e66 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Fri, 15 Feb 2019 12:50:24 +0100
-Subject: netfilter: nf_tables: fix flush after rule deletion in the same batch
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-commit 23b7ca4f745f21c2b9cfcb67fdd33733b3ae7e66 upstream.
-
-Flush after rule deletion bogusly hits -ENOENT. Skip rules that have
-been already from nft_delrule_by_chain() which is always called from the
-flush path.
-
-Fixes: cf9dc09d0949 ("netfilter: nf_tables: fix missing rules flushing per table")
-Reported-by: Phil Sutter <phil@nwl.cc>
-Acked-by: Phil Sutter <phil@nwl.cc>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/netfilter/nf_tables_api.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -281,6 +281,9 @@ static int nft_delrule_by_chain(struct n
-       int err;
-       list_for_each_entry(rule, &ctx->chain->rules, list) {
-+              if (!nft_is_active_next(ctx->net, rule))
-+                      continue;
-+
-               err = nft_delrule(ctx, rule);
-               if (err < 0)
-                       return err;
index 6275ad2ade1023cc0b744b9991859b03de4a27b7..6cdba458f36f83a2a27366916d23698ae97a06ea 100644 (file)
@@ -22,4 +22,3 @@ net-packet-fix-4gb-buffer-limit-due-to-overflow-check.patch
 team-avoid-complex-list-operations-in-team_nl_cmd_options_set.patch
 sit-check-if-ipv6-enabled-before-calling-ip6_err_gen_icmpv6_unreach.patch
 netlink-trim-skb-to-alloc-size-to-avoid-msg_trunc.patch
-netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch
diff --git a/queue-4.4/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch b/queue-4.4/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch
deleted file mode 100644 (file)
index 16d979f..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 23b7ca4f745f21c2b9cfcb67fdd33733b3ae7e66 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Fri, 15 Feb 2019 12:50:24 +0100
-Subject: netfilter: nf_tables: fix flush after rule deletion in the same batch
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-commit 23b7ca4f745f21c2b9cfcb67fdd33733b3ae7e66 upstream.
-
-Flush after rule deletion bogusly hits -ENOENT. Skip rules that have
-been already from nft_delrule_by_chain() which is always called from the
-flush path.
-
-Fixes: cf9dc09d0949 ("netfilter: nf_tables: fix missing rules flushing per table")
-Reported-by: Phil Sutter <phil@nwl.cc>
-Acked-by: Phil Sutter <phil@nwl.cc>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/netfilter/nf_tables_api.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -314,6 +314,9 @@ static int nft_delrule_by_chain(struct n
-       int err;
-       list_for_each_entry(rule, &ctx->chain->rules, list) {
-+              if (!nft_is_active_next(ctx->net, rule))
-+                      continue;
-+
-               err = nft_delrule(ctx, rule);
-               if (err < 0)
-                       return err;
index 4a9d810e37b266da9ea533511791fe809bc986c6..45986f382a7b6f0dff4af962951b28f7244ae5d4 100644 (file)
@@ -27,4 +27,3 @@ sit-check-if-ipv6-enabled-before-calling-ip6_err_gen_icmpv6_unreach.patch
 net-mlx4_en-force-checksum_none-for-short-ethernet-frames.patch
 arcv2-enable-unaligned-access-in-early-asm-code.patch
 revert-bridge-do-not-add-port-to-router-list-when-receives-query-with-source-0.0.0.0.patch
-netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch