netfilter: nftables: fix nf_trace always-on with XT_TRACE=n
Subsystems (3)
Florian Westphal
maintainerPATCH 1/1 netfilter: nftables: fix nf_trace always-on with XT_TRACE=n
When using nftables with CONFIG_NETFILTER_XT_TARGET_TRACE=n, we get lots of "TRACE: filter:output:policy:1 IN=..." warnings as several places will leave skb->nf_trace uninitialised.
Unlike iptables tracing functionality is not conditional in nftables, so always copy/zero nf_trace setting when nftables is enabled.
Move this into __nf_copy() helper.
--- include/linux/skbuff.h | 5 ++++- net/core/skbuff.c | 3 --- net/ipv4/ip_output.c | 3 --- net/ipv6/ip6_output.c | 3 --- 4 files changed, 4 insertions(+), 10 deletions(-)
include/linux/skbuff.h +4 -1
@@ -2724,7 +2724,7 @@ static inline void nf_reset(struct sk_buff *skb)static inline void nf_reset_trace (struct sk_buff *skb) { -#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) +#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) || defined(CONFIG_NF_TABLES ) skb->nf_trace =0 ;#endif }
@@ -2741,6 +2741,9 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src) dst->nf_bridge = src->nf_bridge;nf_bridge_get (src->nf_bridge);#endif +#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) || defined(CONFIG_NF_TABLES ) + dst->nf_trace = src->nf_trace; +#endif }static inline void nf_copy (struct sk_buff *dst,const struct sk_buff *src)
net/core/skbuff.c +0 -3
@@ -705,9 +705,6 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) new->mark = old->mark; new->skb_iif = old->skb_iif;__nf_copy (new, old); -#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) - new->nf_trace = old->nf_trace; -#endif #ifdef CONFIG_NET_SCHED new->tc_index = old->tc_index;#ifdef CONFIG_NET_CLS_ACT
net/ipv4/ip_output.c +0 -3
@@ -422,9 +422,6 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) to->tc_index = from->tc_index;#endif nf_copy (to, from); -#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) - to->nf_trace = from->nf_trace; -#endif #if defined(CONFIG_IP_VS ) || defined(CONFIG_IP_VS_MODULE ) to->ipvs_property = from->ipvs_property;#endif
net/ipv6/ip6_output.c +0 -3
@@ -517,9 +517,6 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from) to->tc_index = from->tc_index;#endif nf_copy (to, from); -#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) - to->nf_trace = from->nf_trace; -#endif skb_copy_secmark (to, from); }
Signature · 1 line
1.8.1.5
Pablo Neira Ayuso
maintainerHi Florian,
Quoted 3 lines · Florian Westphal
When using nftables with
CONFIG_NETFILTER_XT_TARGET_TRACE=n, we get lots of "TRACE: filter:output:policy:1 IN=..." warnings as several places will leaveskb->nf_traceuninitialised.
Good catch.
Quoted 18 lines
Unlike iptables tracing functionality is not conditional in nftables, so always copy/zero
nf_tracesetting when nftables is enabled.Move this into
__nf_copy()helper.Signed-off-by Florian Westphal <[email protected]>--- include/linux/skbuff.h | 5 ++++- net/core/skbuff.c | 3 --- net/ipv4/ip_output.c | 3 --- net/ipv6/ip6_output.c | 3 --- 4 files changed, 4 insertions(+), 10 deletions(-)include/linux/skbuff.h +0
-0
include/linux/skbuff.h static inline void nf_reset(struct sk_buff *skb) · line 2727
Quoted 5 lines
include/linux/skbuff.h +1
-1@@ -2724,7 +2724,7 @@ static inline void nf_reset(struct sk_buff *skb)static inline void nf_reset_trace (struct sk_buff *skb) { -#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) +#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) || defined(CONFIG_NF_TABLES )
Perhaps you can add a generic CONFIG_NF_TRACE that is set by xt_trace and nf_tables?
Florian Westphal
maintainerQuoted 7 lines · Pablo Neira Ayuso
include/linux/skbuff.h static inline void nf_reset(struct sk_buff *skb) · line 2727
Quoted 4 lines
static inline void
nf_reset_trace(struct sk_buff *skb){include/linux/skbuff.h +1
-1-#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) +#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) || defined(CONFIG_NF_TABLES )Perhaps you can add a generic
CONFIG_NF_TRACEthat is set byxt_traceandnf_tables?
I could do that, sure, but I don't see the value in doing so. After this patch the only place where we need to test for both are the two places in skbuff.h.
Unless you want to make the nf_trace operations in nftables conditional on CONFIG_NF_TRACE?
OTOH I think that trace support is a very important thing to have and I doubt that compiling it out would save a lot of size.
But sure, if you think it makes sense I can add CONFIG_NF_TRACE and make nf_tables tracing conditional.
Pablo Neira Ayuso
maintainerQuoted 9 lines · Florian Westphal
Quoted 7 lines · Pablo Neira Ayuso
include/linux/skbuff.h static inline void nf_reset(struct sk_buff *skb) · line 2727
Quoted 4 lines
static inline void
nf_reset_trace(struct sk_buff *skb){include/linux/skbuff.h +1
-1-#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) +#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) || defined(CONFIG_NF_TABLES )Perhaps you can add a generic
CONFIG_NF_TRACEthat is set byxt_traceandnf_tables?
Quoted 6 lines
I could do that, sure, but I don't see the value in doing so. After this patch the only place where we need to test for both are the two places in
skbuff.h.Unless you want to make the
nf_traceoperations in nftables conditional onCONFIG_NF_TRACE?
No, that wasn't my intention.
Quoted 5 lines
OTOH I think that trace support is a very important thing to have and I doubt that compiling it out would save a lot of size.
But sure, if you think it makes sense I can add
CONFIG_NF_TRACEand makenf_tablestracing conditional.
This is just a cosmetic comment, but I can live with that long #if line. Leave it up to you to decide.
Quoted 19 lines · Pablo Neira Ayuso
Quoted 9 lines · Florian Westphal
Quoted 7 lines · Pablo Neira Ayuso
include/linux/skbuff.h static inline void nf_reset(struct sk_buff *skb) · line 2727
Quoted 4 lines
static inline void
nf_reset_trace(struct sk_buff *skb){include/linux/skbuff.h +1
-1-#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) +#if IS_ENABLED (CONFIG_NETFILTER_XT_TARGET_TRACE ) || defined(CONFIG_NF_TABLES )Perhaps you can add a generic
CONFIG_NF_TRACEthat is set byxt_traceandnf_tables?Quoted 6 lines
I could do that, sure, but I don't see the value in doing so. After this patch the only place where we need to test for both are the two places in
skbuff.h.Unless you want to make the
nf_traceoperations in nftables conditional onCONFIG_NF_TRACE?No, that wasn't my intention.
Quoted 8 lines
Quoted 5 lines
OTOH I think that trace support is a very important thing to have and I doubt that compiling it out would save a lot of size.
But sure, if you think it makes sense I can add
CONFIG_NF_TRACEand makenf_tablestracing conditional.This is just a cosmetic comment, but I can live with that long #if line. Leave it up to you to decide.
I intend to make nftables tracing use static keys, unless that turns out not to reduce the overhead we can keep it unconditionally.
Florian Westphal
maintainerQuoted 8 lines · Pablo Neira Ayuso
Quoted 5 lines
OTOH I think that trace support is a very important thing to have and I doubt that compiling it out would save a lot of size.
But sure, if you think it makes sense I can add
CONFIG_NF_TRACEand makenf_tablestracing conditional.This is just a cosmetic comment, but I can live with that long #if line. Leave it up to you to decide.
I see. I that case please consider applying the present patch. I think adding extra kconfig symbol just for the sake of avoiding two longer IS_ENABLED() statements is plain overkill :-)
Quoted 8 lines · Florian Westphal
When using nftables with
CONFIG_NETFILTER_XT_TARGET_TRACE=n, we get lots of "TRACE: filter:output:policy:1 IN=..." warnings as several places will leaveskb->nf_traceuninitialised.Unlike iptables tracing functionality is not conditional in nftables, so always copy/zero
nf_tracesetting when nftables is enabled.Move this into
__nf_copy()helper.
Applied, thanks.