You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Sun, 25 Feb 2018 15:39:56 +0100
|
|
Subject: [PATCH] netfilter: nf_flow_table: in flow_offload_lookup, skip
|
|
entries being deleted
|
|
|
|
Preparation for sending flows back to the slow path
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/net/netfilter/nf_flow_table_core.c
|
|
+++ b/net/netfilter/nf_flow_table_core.c
|
|
@@ -184,8 +184,21 @@ struct flow_offload_tuple_rhash *
|
|
flow_offload_lookup(struct nf_flowtable *flow_table,
|
|
struct flow_offload_tuple *tuple)
|
|
{
|
|
- return rhashtable_lookup_fast(&flow_table->rhashtable, tuple,
|
|
- nf_flow_offload_rhash_params);
|
|
+ struct flow_offload_tuple_rhash *tuplehash;
|
|
+ struct flow_offload *flow;
|
|
+ int dir;
|
|
+
|
|
+ tuplehash = rhashtable_lookup_fast(&flow_table->rhashtable, tuple,
|
|
+ nf_flow_offload_rhash_params);
|
|
+ if (!tuplehash)
|
|
+ return NULL;
|
|
+
|
|
+ dir = tuplehash->tuple.dir;
|
|
+ flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]);
|
|
+ if (flow->flags & (FLOW_OFFLOAD_DYING | FLOW_OFFLOAD_TEARDOWN))
|
|
+ return NULL;
|
|
+
|
|
+ return tuplehash;
|
|
}
|
|
EXPORT_SYMBOL_GPL(flow_offload_lookup);
|
|
|