| Message ID | 20130529084118.6676862C72@unicorn.suse.cz |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, May 29, 2013 at 10:37:03AM +0200, Michal Kubecek wrote: > 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. Applied, thanks Michal. The problem seems to be there since the beginning, ie. 2.6.26. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 29, 2013 at 01:18:22PM +0200, Pablo Neira Ayuso wrote: > On Wed, May 29, 2013 at 10:37:03AM +0200, Michal Kubecek wrote: > > 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. > > Applied, thanks Michal. > > The problem seems to be there since the beginning, ie. 2.6.26. Yes, as far as I can say, the IPv6 part actually never worked. Michal Kubeček -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); }
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> --- net/netfilter/xt_LOG.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)