[PATCH] netfilter: conditionally use ct and ctinfo

From: trix
Date: Sat Mar 05 2022 - 13:10:29 EST


From: Tom Rix <trix@xxxxxxxxxx>

The setting ct and ctinfo are controlled by
CONF_NF_CONNTRACK. So their use should also
be controlled.

Signed-off-by: Tom Rix <trix@xxxxxxxxxx>
---
net/netfilter/nfnetlink_log.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index d97eb280cb2e8..141e0ebf4bc23 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -629,9 +629,11 @@ __build_packet_message(struct nfnl_log_net *log,
htonl(atomic_inc_return(&log->global_seq))))
goto nla_put_failure;

+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
if (ct && nfnl_ct->build(inst->skb, ct, ctinfo,
NFULA_CT, NFULA_CT_INFO) < 0)
goto nla_put_failure;
+#endif

if ((pf == NFPROTO_NETDEV || pf == NFPROTO_BRIDGE) &&
nfulnl_put_bridge(inst, skb) < 0)
--
2.26.3