diff options
author | Michal Kubeček <mkubecek@suse.cz> | 2013-05-28 22:37:03 +0000 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-05-29 12:29:18 +0200 |
commit | d660164d79b67f879db35a7d61e47d3b99bc714e (patch) | |
tree | 8aa572687a6d1d46387425c59816975c101ecfc3 /net | |
parent | dc7b3eb900aab02e5cafbca3948d005be13fb4a5 (diff) | |
download | linux-stable-d660164d79b67f879db35a7d61e47d3b99bc714e.tar.gz linux-stable-d660164d79b67f879db35a7d61e47d3b99bc714e.tar.bz2 linux-stable-d660164d79b67f879db35a7d61e47d3b99bc714e.zip |
netfilter: xt_LOG: fix mark logging for IPv6 packets
In dump_ipv6_packet(), the "recurse" parameter is zero only if
dumping contents of a packet embedded into an ICMPv6 error
message. Therefore we want to log packet mark if recurse is
non-zero, not when it is zero.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/xt_LOG.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c index 491c7d821a0b..5ab24843370a 100644 --- a/net/netfilter/xt_LOG.c +++ b/net/netfilter/xt_LOG.c @@ -737,7 +737,7 @@ static void dump_ipv6_packet(struct sbuff *m, dump_sk_uid_gid(m, skb->sk); /* Max length: 16 "MARK=0xFFFFFFFF " */ - if (!recurse && skb->mark) + if (recurse && skb->mark) sb_add(m, "MARK=0x%x ", skb->mark); } |