leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: nf_tables: fix nf_log_trace based tracing

Browse Source 
nf_log_trace() outputs bogus 'TRACE:' strings because I forgot to update
the comments array.

Fixes: 33d5a7b14b ("netfilter: nf_tables: extend tracing infrastructure")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal
2015-12-09 16:31:21 +01:00
committed by Pablo Neira Ayuso
parent 23509fcd4e
commit 9fb0b519c7
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/netfilter/nf_tables_core.c
View File

@@ -23,16 +23,10 @@
#include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h>
#include <net/netfilter/nf_log.h> #include <net/netfilter/nf_log.h>
enum nft_trace { static const char *const comments[__NFT_TRACETYPE_MAX] = {
NFT_TRACE_RULE, [NFT_TRACETYPE_POLICY] = "policy",
NFT_TRACE_RETURN, [NFT_TRACETYPE_RETURN] = "return",
NFT_TRACE_POLICY, [NFT_TRACETYPE_RULE] = "rule",
};
static const char *const comments[] = {
[NFT_TRACE_RULE] = "rule",
[NFT_TRACE_RETURN] = "return",
[NFT_TRACE_POLICY] = "policy",
}; };
static struct nf_loginfo trace_loginfo = { static struct nf_loginfo trace_loginfo = {
@@ -47,7 +41,7 @@ static struct nf_loginfo trace_loginfo = {
static noinline void __nft_trace_packet(struct nft_traceinfo *info, static noinline void __nft_trace_packet(struct nft_traceinfo *info,
const struct nft_chain *chain, const struct nft_chain *chain,
int rulenum, enum nft_trace type) int rulenum, enum nft_trace_types type)
{ {
const struct nft_pktinfo *pkt = info->pkt; const struct nft_pktinfo *pkt = info->pkt;