Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32fa10b2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://1984.lsi.us.es/nf 



Pablo Neira Ayuso says:

====================
The following batch contains Netfilter fixes for 3.8-rc2, they are:

* Fix IPv6 stateless network/port translation (NPT) checksum
  calculation, from Ulrich Weber.

* Fix for xt_recent to avoid memory allocation failures if large
  hashtables are used, from Eric Dumazet.

* Fix missing dependencies in Kconfig for the deprecated NOTRACK,
  from myself.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c7e2e1d7 2727de76

net/ipv6/netfilter/ip6t_NPT.c

+7 −26
Original line number Diff line number Diff line
@@ -14,42 +14,23 @@ 
#include <linux/netfilter_ipv6/ip6t_NPT.h>

#include <linux/netfilter/x_tables.h>



static __sum16 csum16_complement(__sum16 a)

{

	return (__force __sum16)(0xffff - (__force u16)a);

}



static __sum16 csum16_add(__sum16 a, __sum16 b)

{

	u16 sum;



	sum = (__force u16)a + (__force u16)b;

	sum += (__force u16)a < (__force u16)b;

	return (__force __sum16)sum;

}



static __sum16 csum16_sub(__sum16 a, __sum16 b)

{

	return csum16_add(a, csum16_complement(b));

}



static int ip6t_npt_checkentry(const struct xt_tgchk_param *par)

{

	struct ip6t_npt_tginfo *npt = par->targinfo;

	__sum16 src_sum = 0, dst_sum = 0;

	__wsum src_sum = 0, dst_sum = 0;

	unsigned int i;



	if (npt->src_pfx_len > 64 || npt->dst_pfx_len > 64)

		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(npt->src_pfx.in6.s6_addr16); i++) {

		src_sum = csum16_add(src_sum,

				(__force __sum16)npt->src_pfx.in6.s6_addr16[i]);

		dst_sum = csum16_add(dst_sum,

				(__force __sum16)npt->dst_pfx.in6.s6_addr16[i]);

		src_sum = csum_add(src_sum,

				(__force __wsum)npt->src_pfx.in6.s6_addr16[i]);

		dst_sum = csum_add(dst_sum,

				(__force __wsum)npt->dst_pfx.in6.s6_addr16[i]);

	}



	npt->adjustment = csum16_sub(src_sum, dst_sum);

	npt->adjustment = (__force __sum16) csum_sub(src_sum, dst_sum);

	return 0;

}
@@ -85,7 +66,7 @@ static bool ip6t_npt_map_pfx(const struct ip6t_npt_tginfo *npt, 
			return false;

	}



	sum = csum16_add((__force __sum16)addr->s6_addr16[idx],

	sum = (__force __sum16) csum_add((__force __wsum)addr->s6_addr16[idx],

			 npt->adjustment);

	if (sum == CSUM_MANGLED_0)

		sum = 0;

net/netfilter/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -682,6 +682,9 @@ config NETFILTER_XT_TARGET_NFQUEUE 


config NETFILTER_XT_TARGET_NOTRACK

	tristate  '"NOTRACK" target support (DEPRECATED)'

	depends on NF_CONNTRACK

	depends on IP_NF_RAW || IP6_NF_RAW

	depends on NETFILTER_ADVANCED

	select NETFILTER_XT_TARGET_CT



config NETFILTER_XT_TARGET_RATEEST

net/netfilter/xt_recent.c

+18 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/skbuff.h>

#include <linux/inet.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <net/net_namespace.h>

#include <net/netns/generic.h>
@@ -310,6 +311,14 @@ recent_mt(const struct sk_buff *skb, struct xt_action_param *par) 
	return ret;

}



static void recent_table_free(void *addr)

{

	if (is_vmalloc_addr(addr))

		vfree(addr);

	else

		kfree(addr);

}



static int recent_mt_check(const struct xt_mtchk_param *par,

			   const struct xt_recent_mtinfo_v1 *info)

{
@@ -322,6 +331,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par, 
#endif

	unsigned int i;

	int ret = -EINVAL;

	size_t sz;



	if (unlikely(!hash_rnd_inited)) {

		get_random_bytes(&hash_rnd, sizeof(hash_rnd));
@@ -360,8 +370,11 @@ static int recent_mt_check(const struct xt_mtchk_param *par, 
		goto out;

	}



	t = kzalloc(sizeof(*t) + sizeof(t->iphash[0]) * ip_list_hash_size,

		    GFP_KERNEL);

	sz = sizeof(*t) + sizeof(t->iphash[0]) * ip_list_hash_size;

	if (sz <= PAGE_SIZE)

		t = kzalloc(sz, GFP_KERNEL);

	else

		t = vzalloc(sz);

	if (t == NULL) {

		ret = -ENOMEM;

		goto out;
@@ -377,14 +390,14 @@ static int recent_mt_check(const struct xt_mtchk_param *par, 
	uid = make_kuid(&init_user_ns, ip_list_uid);

	gid = make_kgid(&init_user_ns, ip_list_gid);

	if (!uid_valid(uid) || !gid_valid(gid)) {

		kfree(t);

		recent_table_free(t);

		ret = -EINVAL;

		goto out;

	}

	pde = proc_create_data(t->name, ip_list_perms, recent_net->xt_recent,

		  &recent_mt_fops, t);

	if (pde == NULL) {

		kfree(t);

		recent_table_free(t);

		ret = -ENOMEM;

		goto out;

	}
@@ -435,7 +448,7 @@ static void recent_mt_destroy(const struct xt_mtdtor_param *par) 
			remove_proc_entry(t->name, recent_net->xt_recent);

#endif

		recent_table_flush(t);

		kfree(t);

		recent_table_free(t);

	}

	mutex_unlock(&recent_mutex);

}