From: David S. Miller <davem@davemloft.net>
Date: Mon, 24 Nov 2014 21:00:58 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=958d03b016586d571a382f863608bc4c6d92a0c8;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge git://git./linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
netfilter/ipvs updates for net-next

The following patchset contains Netfilter updates for your net-next
tree, this includes the NAT redirection support for nf_tables, the
cgroup support for nft meta and conntrack zone support for the connlimit
match. Coming after those, a bunch of sparse warning fixes, missing
netns bits and cleanups. More specifically, they are:

1) Prepare IPv4 and IPv6 NAT redirect code to use it from nf_tables,
   patches from Arturo Borrero.

2) Introduce the nf_tables redir expression, from Arturo Borrero.

3) Remove an unnecessary assignment in ip_vs_xmit/__ip_vs_get_out_rt().
   Patch from Alex Gartrell.

4) Add nft_log_dereference() macro to the nf_log infrastructure, patch
   from Marcelo Leitner.

5) Add some extra validation when registering logger families, also
   from Marcelo.

6) Some spelling cleanups from stephen hemminger.

7) Fix sparse warning in nf_logger_find_get().

8) Add cgroup support to nf_tables meta, patch from Ana Rey.

9) A Kconfig fix for the new redir expression and fix sparse warnings in
   the new redir expression.

10) Fix several sparse warnings in the netfilter tree, from
    Florian Westphal.

11) Reduce verbosity when OOM in nfnetlink_log. User can basically do
    nothing when this situation occurs.

12) Add conntrack zone support to xt_connlimit, again from Florian.

13) Add netnamespace support to the h323 conntrack helper, contributed
    by Vasily Averin.

14) Remove unnecessary nul-pointer checks before free_percpu() and
    module_put(), from Markus Elfring.

15) Use pr_fmt in nfnetlink_log, again patch from Marcelo Leitner.
====================

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

958d03b016586d571a382f863608bc4c6d92a0c8
diff --cc net/ipv4/netfilter/nf_reject_ipv4.c
index 1baaa83dfe5c,cdcb9a5d6786..536da7bc598a
--- a/net/ipv4/netfilter/nf_reject_ipv4.c
+++ b/net/ipv4/netfilter/nf_reject_ipv4.c
@@@ -11,13 -11,17 +11,14 @@@
  #include <net/tcp.h>
  #include <net/route.h>
  #include <net/dst.h>
+ #include <net/netfilter/ipv4/nf_reject.h>
  #include <linux/netfilter_ipv4.h>
 +#include <net/netfilter/ipv4/nf_reject.h>
  
 -/* Send RST reply */
 -void nf_send_reset(struct sk_buff *oldskb, int hook)
 +const struct tcphdr *nf_reject_ip_tcphdr_get(struct sk_buff *oldskb,
 +					     struct tcphdr *_oth, int hook)
  {
 -	struct sk_buff *nskb;
 -	const struct iphdr *oiph;
 -	struct iphdr *niph;
  	const struct tcphdr *oth;
 -	struct tcphdr _otcph, *tcph;
  
  	/* IP header checks: fragment. */
  	if (ip_hdr(oldskb)->frag_off & htons(IP_OFFSET))
diff --cc net/ipv6/netfilter/nf_reject_ipv6.c
index 015eb8a80766,87576ff15e1b..d05b36440e8b
--- a/net/ipv6/netfilter/nf_reject_ipv6.c
+++ b/net/ipv6/netfilter/nf_reject_ipv6.c
@@@ -11,21 -11,32 +11,22 @@@
  #include <net/ip6_route.h>
  #include <net/ip6_fib.h>
  #include <net/ip6_checksum.h>
+ #include <net/netfilter/ipv6/nf_reject.h>
  #include <linux/netfilter_ipv6.h>
 +#include <net/netfilter/ipv6/nf_reject.h>
  
 -void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)
 +const struct tcphdr *nf_reject_ip6_tcphdr_get(struct sk_buff *oldskb,
 +					      struct tcphdr *otcph,
 +					      unsigned int *otcplen, int hook)
  {
 -	struct sk_buff *nskb;
 -	struct tcphdr otcph, *tcph;
 -	unsigned int otcplen, hh_len;
 -	int tcphoff, needs_ack;
  	const struct ipv6hdr *oip6h = ipv6_hdr(oldskb);
 -	struct ipv6hdr *ip6h;
 -#define DEFAULT_TOS_VALUE	0x0U
 -	const __u8 tclass = DEFAULT_TOS_VALUE;
 -	struct dst_entry *dst = NULL;
  	u8 proto;
  	__be16 frag_off;
 -	struct flowi6 fl6;
 -
 -	if ((!(ipv6_addr_type(&oip6h->saddr) & IPV6_ADDR_UNICAST)) ||
 -	    (!(ipv6_addr_type(&oip6h->daddr) & IPV6_ADDR_UNICAST))) {
 -		pr_debug("addr is not unicast.\n");
 -		return;
 -	}
 +	int tcphoff;
  
  	proto = oip6h->nexthdr;
 -	tcphoff = ipv6_skip_exthdr(oldskb, ((u8*)(oip6h+1) - oldskb->data), &proto, &frag_off);
 +	tcphoff = ipv6_skip_exthdr(oldskb, ((u8*)(oip6h+1) - oldskb->data),
 +				   &proto, &frag_off);
  
  	if ((tcphoff < 0) || (tcphoff > oldskb->len)) {
  		pr_debug("Cannot get TCP header.\n");