From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 3/6] netfilter: nf_tables: fix tracing of the goto action
Date: Tue, 20 May 2014 11:45:23 +0200 [thread overview]
Message-ID: <1400579126-6451-4-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1400579126-6451-1-git-send-email-pablo@netfilter.org>
Add missing code to trace goto actions.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_tables_core.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nf_tables_core.c b/net/netfilter/nf_tables_core.c
index 7d83a49..f55fb28 100644
--- a/net/netfilter/nf_tables_core.c
+++ b/net/netfilter/nf_tables_core.c
@@ -171,8 +171,12 @@ next_rule:
jumpstack[stackptr].rule = rule;
jumpstack[stackptr].rulenum = rulenum;
stackptr++;
- /* fall through */
+ chain = data[NFT_REG_VERDICT].chain;
+ goto do_chain;
case NFT_GOTO:
+ if (unlikely(pkt->skb->nf_trace))
+ nft_trace_packet(pkt, chain, rulenum, NFT_TRACE_RULE);
+
chain = data[NFT_REG_VERDICT].chain;
goto do_chain;
case NFT_RETURN:
--
1.7.10.4
next prev parent reply other threads:[~2014-05-20 9:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 9:45 [PATCH 0/6] Netfilter/nftables fixes for net Pablo Neira Ayuso
2014-05-20 9:45 ` [PATCH 1/6] netfilter: nf_tables: reset rule number counter after jump and goto Pablo Neira Ayuso
2014-05-20 9:45 ` [PATCH 2/6] netfilter: nf_tables: fix goto action Pablo Neira Ayuso
2014-05-20 9:45 ` Pablo Neira Ayuso [this message]
2014-05-20 9:45 ` [PATCH 4/6] netfilter: nf_tables: fix bogus rulenum after " Pablo Neira Ayuso
2014-05-20 9:45 ` [PATCH 5/6] netfilter: nf_tables: fix missing return trace at the end of non-base chain Pablo Neira Ayuso
2014-05-20 9:45 ` [PATCH 6/6] netfilter: nf_tables: fix trace of matching non-terminal rule Pablo Neira Ayuso
2014-05-21 5:25 ` [PATCH 0/6] Netfilter/nftables fixes for net David Miller
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=1400579126-6451-4-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.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).