f07fe36f22
Move patches to backport-5.10, since the series was accepted upstream Signed-off-by: Felix Fietkau <nbd@nbd.name>
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Tue, 23 Mar 2021 00:56:26 +0100
|
|
Subject: [PATCH] netfilter: flowtable: call dst_check() to fall back to
|
|
classic forwarding
|
|
|
|
In case the route is stale, pass up the packet to the classic forwarding
|
|
path for re-evaluation and schedule this flow entry for removal.
|
|
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
|
|
--- a/net/netfilter/nf_flow_table_ip.c
|
|
+++ b/net/netfilter/nf_flow_table_ip.c
|
|
@@ -197,14 +197,6 @@ static bool nf_flow_exceeds_mtu(const st
|
|
return true;
|
|
}
|
|
|
|
-static int nf_flow_offload_dst_check(struct dst_entry *dst)
|
|
-{
|
|
- if (unlikely(dst_xfrm(dst)))
|
|
- return dst_check(dst, 0) ? 0 : -1;
|
|
-
|
|
- return 0;
|
|
-}
|
|
-
|
|
static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb,
|
|
const struct nf_hook_state *state,
|
|
struct dst_entry *dst)
|
|
@@ -256,7 +248,7 @@ nf_flow_offload_ip_hook(void *priv, stru
|
|
|
|
flow_offload_refresh(flow_table, flow);
|
|
|
|
- if (nf_flow_offload_dst_check(&rt->dst)) {
|
|
+ if (!dst_check(&rt->dst, 0)) {
|
|
flow_offload_teardown(flow);
|
|
return NF_ACCEPT;
|
|
}
|
|
@@ -476,7 +468,7 @@ nf_flow_offload_ipv6_hook(void *priv, st
|
|
|
|
flow_offload_refresh(flow_table, flow);
|
|
|
|
- if (nf_flow_offload_dst_check(&rt->dst)) {
|
|
+ if (!dst_check(&rt->dst, 0)) {
|
|
flow_offload_teardown(flow);
|
|
return NF_ACCEPT;
|
|
}
|