diff options
| author | Ye Yin <hustcat@gmail.com> | 2017-10-26 16:57:05 +0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-12-06 21:20:14 -0500 |
| commit | 9eb6a97a5a890f2fad4990af14af5ba63859dadf (patch) | |
| tree | 37118527f38f9650be7b59d8ae6c3df4b4833d7e | |
| parent | 7a7e7af06539cb2841425f7cc861e779b0f94b91 (diff) | |
| download | linux-9eb6a97a5a890f2fad4990af14af5ba63859dadf.tar.gz linux-9eb6a97a5a890f2fad4990af14af5ba63859dadf.tar.bz2 linux-9eb6a97a5a890f2fad4990af14af5ba63859dadf.zip | |
netfilter/ipvs: clear ipvs_property flag when SKB net namespace changed
[ Upstream commit 2b5ec1a5f9738ee7bf8f5ec0526e75e00362c48f ]
When run ipvs in two different network namespace at the same host, and one
ipvs transport network traffic to the other network namespace ipvs.
'ipvs_property' flag will make the second ipvs take no effect. So we should
clear 'ipvs_property' when SKB network namespace changed.
Fixes: 621e84d6f373 ("dev: introduce skb_scrub_packet()")
Signed-off-by: Ye Yin <hustcat@gmail.com>
Signed-off-by: Wei Zhou <chouryzhou@gmail.com>
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | include/linux/skbuff.h | 7 | ||||
| -rw-r--r-- | net/core/skbuff.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index ca2e26a486ee..495ad8fbe240 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3230,6 +3230,13 @@ static inline void nf_reset_trace(struct sk_buff *skb) #endif } +static inline void ipvs_reset(struct sk_buff *skb) +{ +#if IS_ENABLED(CONFIG_IP_VS) + skb->ipvs_property = 0; +#endif +} + /* Note: This doesn't put any conntrack and bridge info in dst. */ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src, bool copy) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c9793c6c5005..2894bb5b7e0a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4159,6 +4159,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) if (!xnet) return; + ipvs_reset(skb); skb_orphan(skb); skb->mark = 0; } |