From: kai zhang <zhangkaiheb@126.com>
To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de,
davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org,
kuba@kernel.org, netfilter-devel@vger.kernel.org,
coreteam@netfilter.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: kai zhang <zhangkaiheb@126.com>
Subject: [PATCH] net: fix duplicate logs of iptables TRACE target
Date: Mon, 24 Jan 2022 05:37:32 +0000 [thread overview]
Message-ID: <20220124053732.55985-1-zhangkaiheb@126.com> (raw)
Below configuration, mangle,filter and security tables have no rule:
# iptables -t raw -I PREROUTING 1 -p tcp --dport 22 -j TRACE
# sysctl net.netfilter.nf_log.2=nf_log_ipv4
There are 5 logs for incoming ssh packet:
kernel: [ 7018.727278] TRACE: raw:PREROUTING:policy:2 IN=enp9s0 ...
kernel: [ 7018.727304] TRACE: mangle:PREROUTING:policy:1 IN=enp9s0 ...
kernel: [ 7018.727327] TRACE: mangle:INPUT:policy:1 IN=enp9s0 ...
kernel: [ 7018.727343] TRACE: filter:INPUT:policy:1 IN=enp9s0 ...
kernel: [ 7018.727359] TRACE: security:INPUT:policy:1 IN=enp9s0 ...
Signed-off-by: kai zhang <zhangkaiheb@126.com>
---
net/ipv4/netfilter/ip_tables.c | 4 +++-
net/ipv6/netfilter/ip6_tables.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 2ed7c58b4..5f0e6096e 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -304,9 +304,11 @@ ipt_do_table(void *priv,
#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
/* The packet is traced: log it */
- if (unlikely(skb->nf_trace))
+ if (unlikely(skb->nf_trace)) {
trace_packet(state->net, skb, hook, state->in,
state->out, table->name, private, e);
+ nf_reset_trace(skb);
+ }
#endif
/* Standard target? */
if (!t->u.kernel.target->target) {
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 2d816277f..ae842a835 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -327,9 +327,11 @@ ip6t_do_table(void *priv, struct sk_buff *skb,
#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
/* The packet is traced: log it */
- if (unlikely(skb->nf_trace))
+ if (unlikely(skb->nf_trace)) {
trace_packet(state->net, skb, hook, state->in,
state->out, table->name, private, e);
+ nf_reset_trace(skb);
+ }
#endif
/* Standard target? */
if (!t->u.kernel.target->target) {
--
2.30.2
next reply other threads:[~2022-01-24 5:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 5:37 kai zhang [this message]
2022-01-24 11:54 ` [PATCH] net: fix duplicate logs of iptables TRACE target Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2022-01-24 5:34 kai zhang
2022-01-24 7:21 ` Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220124053732.55985-1-zhangkaiheb@126.com \
--to=zhangkaiheb@126.com \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).