From f39315c20db4602653c8668f30eea8ed72feb71d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 25 Feb 2019 19:17:01 +0100 Subject: [PATCH] drop patch from 3.18 and 4.4 --- ...fter-rule-deletion-in-the-same-batch.patch | 35 ------------------- queue-3.18/series | 1 - ...fter-rule-deletion-in-the-same-batch.patch | 35 ------------------- queue-4.4/series | 1 - 4 files changed, 72 deletions(-) delete mode 100644 queue-3.18/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch delete mode 100644 queue-4.4/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch 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 index db7cb6c2dc1..00000000000 --- a/queue-3.18/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 23b7ca4f745f21c2b9cfcb67fdd33733b3ae7e66 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -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 - -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 -Acked-by: Phil Sutter -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Greg Kroah-Hartman - ---- - 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; diff --git a/queue-3.18/series b/queue-3.18/series index 6275ad2ade1..6cdba458f36 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -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 index 16d979f2423..00000000000 --- a/queue-4.4/netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 23b7ca4f745f21c2b9cfcb67fdd33733b3ae7e66 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -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 - -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 -Acked-by: Phil Sutter -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Greg Kroah-Hartman - ---- - 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; diff --git a/queue-4.4/series b/queue-4.4/series index 4a9d810e37b..45986f382a7 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -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 -- 2.39.5