3.5.7.17 -stable review patch. If anyone has any objections, please let me know.
------------------ From: =?UTF-8?q?Michal=20Kube=C4=8Dek?= <[email protected]> commit d660164d79b67f879db35a7d61e47d3b99bc714e upstream. 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 <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]> Signed-off-by: Luis Henriques <[email protected]> --- net/netfilter/xt_LOG.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c index ff5f75f..a2e878f 100644 --- a/net/netfilter/xt_LOG.c +++ b/net/netfilter/xt_LOG.c @@ -727,7 +727,7 @@ static void dump_ipv6_packet(struct sbuff *m, } /* Max length: 16 "MARK=0xFFFFFFFF " */ - if (!recurse && skb->mark) + if (recurse && skb->mark) sb_add(m, "MARK=0x%x ", skb->mark); } -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
