From: David S. Miller <davem@davemloft.net>
Date: Sun, 6 Sep 2015 00:36:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=53cfd053e4d82b46dddc5d3522700263016e3156;p=linux-beck.git

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

Conflicts:
	include/net/netfilter/nf_conntrack.h

The conflict was an overlap between changing the type of the zone
argument to nf_ct_tmpl_alloc() whilst exporting nf_ct_tmpl_free.

Pablo Neira Ayuso says:

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

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

1) Oneliner to restore maps in nf_tables since we support addressing registers
   at 32 bits level.

2) Restore previous default behaviour in bridge netfilter when CONFIG_IPV6=n,
   oneliner from Bernhard Thaler.

3) Out of bound access in ipset hash:net* set types, reported by Dave Jones'
   KASan utility, patch from Jozsef Kadlecsik.

4) Fix ipset compilation with gcc 4.4.7 related to C99 initialization of
   unnamed unions, patch from Elad Raz.

5) Add a workaround to address inconsistent endianess in the res_id field of
   nfnetlink batch messages, reported by Florian Westphal.

6) Fix error paths of CT/synproxy since the conntrack template was moved to use
   kmalloc, patch from Daniel Borkmann.

All of them look good to me to reach 4.2, I can route this to -stable myself
too, just let me know what you prefer.
====================

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

53cfd053e4d82b46dddc5d3522700263016e3156
diff --cc include/net/netfilter/nf_conntrack.h
index f5e23c6dee8b,4023c4ce260f..e8ad46834df8
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@@ -295,9 -291,8 +295,10 @@@ extern unsigned int nf_conntrack_max
  extern unsigned int nf_conntrack_hash_rnd;
  void init_nf_conntrack_hash_rnd(void);
  
 -struct nf_conn *nf_ct_tmpl_alloc(struct net *net, u16 zone, gfp_t flags);
 +struct nf_conn *nf_ct_tmpl_alloc(struct net *net,
 +				 const struct nf_conntrack_zone *zone,
 +				 gfp_t flags);
+ void nf_ct_tmpl_free(struct nf_conn *tmpl);
  
  #define NF_CT_STAT_INC(net, count)	  __this_cpu_inc((net)->ct.stat->count)
  #define NF_CT_STAT_INC_ATOMIC(net, count) this_cpu_inc((net)->ct.stat->count)