From: David S. Miller <davem@davemloft.net>
Date: Thu, 2 Jun 2016 00:54:19 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v4.14-rc1~3052^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc14963f249f9aca1ac84c9c8659b4f35e0a315e;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for your net tree,
they are:

1) Fix incorrect timestamp in nfnetlink_queue introduced when addressing
   y2038 safe timestamp, from Florian Westphal.

2) Get rid of leftover conntrack definition from the previous merge
   window, oneliner from Florian.

3) Make nf_queue handler pernet to resolve race on dereferencing the
   hook state structure with netns removal, from Eric Biederman.

4) Ensure clean exit on unregistered helper ports, from Taehee Yoo.

5) Restore FLOWI_FLAG_KNOWN_NH in nf_dup_ipv6. This got lost while
   generalizing xt_TEE to add packet duplication support in nf_tables,
   from Paolo Abeni.

6) Insufficient netlink NFTA_SET_TABLE attribute check in
   nf_tables_getset(), from Phil Turnbull.

7) Reject helper registration on duplicated ports via modparams.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

fc14963f249f9aca1ac84c9c8659b4f35e0a315e
diff --cc net/netfilter/nfnetlink_queue.c
index aa93877,309ac02..5d36a09
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@@ -552,12 -497,9 +552,12 @@@ nfqnl_build_packet_message(struct net *
  		}
  	}
  
 +	if (nfqnl_put_bridge(entry, skb) < 0)
 +		goto nla_put_failure;
 +
  	if (entskb->tstamp.tv64) {
  		struct nfqnl_msg_packet_timestamp ts;
- 		struct timespec64 kts = ktime_to_timespec64(skb->tstamp);
+ 		struct timespec64 kts = ktime_to_timespec64(entskb->tstamp);
  
  		ts.sec = cpu_to_be64(kts.tv_sec);
  		ts.usec = cpu_to_be64(kts.tv_nsec / NSEC_PER_USEC);