From: Greg Kroah-Hartman Date: Mon, 30 Mar 2020 14:12:12 +0000 (+0200) Subject: drop queue-5.5/netfilter-flowtable-fix-flushing-of-offloaded-flows-on-free.patch X-Git-Tag: v5.6.1~39 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d47acdce121a04c2f5731a4e09e1bfd3c4b3ca36;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.5/netfilter-flowtable-fix-flushing-of-offloaded-flows-on-free.patch --- diff --git a/queue-5.5/netfilter-flowtable-fix-flushing-of-offloaded-flows-on-free.patch b/queue-5.5/netfilter-flowtable-fix-flushing-of-offloaded-flows-on-free.patch deleted file mode 100644 index e353c2ac847..00000000000 --- a/queue-5.5/netfilter-flowtable-fix-flushing-of-offloaded-flows-on-free.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c921ffe853332584eae4f5905cb2a14a7b3c9932 Mon Sep 17 00:00:00 2001 -From: Paul Blakey -Date: Thu, 19 Mar 2020 11:52:25 +0200 -Subject: netfilter: flowtable: Fix flushing of offloaded flows on free - -From: Paul Blakey - -commit c921ffe853332584eae4f5905cb2a14a7b3c9932 upstream. - -Freeing a flowtable with offloaded flows, the flow are deleted from -hardware but are not deleted from the flow table, leaking them, -and leaving their offload bit on. - -Add a second pass of the disabled gc to delete the these flows from -the flow table before freeing it. - -Fixes: c29f74e0df7a ("netfilter: nf_flow_table: hardware offload support") -Signed-off-by: Paul Blakey -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Greg Kroah-Hartman - ---- - net/netfilter/nf_flow_table_core.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/net/netfilter/nf_flow_table_core.c -+++ b/net/netfilter/nf_flow_table_core.c -@@ -554,6 +554,9 @@ void nf_flow_table_free(struct nf_flowta - nf_flow_table_iterate(flow_table, nf_flow_table_do_cleanup, NULL); - nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, flow_table); - nf_flow_table_offload_flush(flow_table); -+ if (nf_flowtable_hw_offload(flow_table)) -+ nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, -+ flow_table); - rhashtable_destroy(&flow_table->rhashtable); - } - EXPORT_SYMBOL_GPL(nf_flow_table_free); diff --git a/queue-5.5/series b/queue-5.5/series index 87728c986bd..b7352a10a2c 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -133,7 +133,6 @@ afs-fix-unpinned-address-list-during-probing.patch ieee80211-fix-he-spr-size-calculation.patch mac80211-set-ieee80211_tx_ctrl_port_ctrl_proto-for-nl80211-tx.patch netfilter-flowtable-reload-ip-v6-h-in-nf_flow_tuple_ip-v6.patch -netfilter-flowtable-fix-flushing-of-offloaded-flows-on-free.patch netfilter-flowtable-populate-addr_type-mask.patch netfilter-nft_fwd_netdev-validate-family-and-chain-type.patch netfilter-nft_fwd_netdev-allow-to-redirect-to-ifb-via-ingress.patch