Re: [PATCH] netfilter/ipvs: clear ipvs_property flag when SKB net namespace changed
From: Julian Anastasov <ja@ssi.bg>
Date: 2017-10-28 10:34:06
Also in:
lkml, lvs-devel
Hello, On Thu, 26 Oct 2017, Ye Yin wrote:
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. Signed-off-by: Ye Yin <redacted> Signed-off-by: Wei Zhou <redacted>
Patch looks good to me. ipvs_property was added long ago
but skb_scrub_packet() is more recent (3.11), so:
Fixes: 621e84d6f373 ("dev: introduce skb_scrub_packet()")
Signed-off-by: Julian Anastasov <ja@ssi.bg>
I guess, DaveM can apply it directly as a bugfix
to the net tree.
quoted hunk ↗ jump to hunk
--- include/linux/skbuff.h | 7 +++++++ net/core/skbuff.c | 1 + 2 files changed, 8 insertions(+)diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 72299ef..d448a48 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h@@ -3770,6 +3770,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 2465607..e140ba4 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c@@ -4864,6 +4864,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) if (!xnet) return; + ipvs_reset(skb); skb_orphan(skb); skb->mark = 0; }-- 1.7.12.4
Regards -- Julian Anastasov [off-list ref]