From: Michal Kubeček Date: Tue, 28 May 2013 22:37:03 +0000 (+0000) Subject: netfilter: xt_LOG: fix mark logging for IPv6 packets X-Git-Tag: v3.10-rc5~25^2~29^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d660164d79b67f879db35a7d61e47d3b99bc714e;p=profile%2Fivi%2Fkernel-x86-ivi.git 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 Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c index 491c7d8..5ab2484 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); }