From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 2 Sep 2019 17:37:43 +0000 (+0200)
Subject: netfilter: nf_flow_table: set default timeout after successful insertion
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=110e48725db6262f260f10727d0fb2d3d25895e4;p=openwrt%2Fstaging%2Fblogic.git

netfilter: nf_flow_table: set default timeout after successful insertion

Set up the default timeout for this new entry otherwise the garbage
collector might quickly remove it right after the flowtable insertion.

Fixes: ac2a66665e23 ("netfilter: add generic flow table infrastructure")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index 80a8f9ae4c93..a0b4bf654de2 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -217,7 +217,7 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)
 		return err;
 	}
 
-	flow->timeout = (u32)jiffies;
+	flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT;
 	return 0;
 }
 EXPORT_SYMBOL_GPL(flow_offload_add);