Skip to content

Commit 32fa10b

Browse files
davem330davem330
committed
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: David S. Miller <davem@davemloft.net>
2 parents c7e2e1d + 2727de7 commit 32fa10b

File tree

3 files changed

+28
-31
lines changed

3 files changed

+28
-31
lines changed

‎net/ipv6/netfilter/ip6t_NPT.c

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,23 @@
1414
#include <linux/netfilter_ipv6/ip6t_NPT.h>
1515
#include <linux/netfilter/x_tables.h>
1616

17-
static __sum16 csum16_complement(__sum16 a)
18-
{
19-
return (__force __sum16)(0xffff - (__force u16)a);
20-
}
21-
22-
static __sum16 csum16_add(__sum16 a, __sum16 b)
23-
{
24-
u16 sum;
25-
26-
sum = (__force u16)a + (__force u16)b;
27-
sum += (__force u16)a < (__force u16)b;
28-
return (__force __sum16)sum;
29-
}
30-
31-
static __sum16 csum16_sub(__sum16 a, __sum16 b)
32-
{
33-
return csum16_add(a, csum16_complement(b));
34-
}
35-
3617
static int ip6t_npt_checkentry(const struct xt_tgchk_param *par)
3718
{
3819
struct ip6t_npt_tginfo *npt = par->targinfo;
39-
__sum16 src_sum = 0, dst_sum = 0;
20+
__wsum src_sum = 0, dst_sum = 0;
4021
unsigned int i;
4122

4223
if (npt->src_pfx_len > 64 || npt->dst_pfx_len > 64)
4324
return -EINVAL;
4425

4526
for (i = 0; i < ARRAY_SIZE(npt->src_pfx.in6.s6_addr16); i++) {
46-
src_sum = csum16_add(src_sum,
47-
(__force __sum16)npt->src_pfx.in6.s6_addr16[i]);
48-
dst_sum = csum16_add(dst_sum,
49-
(__force __sum16)npt->dst_pfx.in6.s6_addr16[i]);
27+
src_sum = csum_add(src_sum,
28+
(__force __wsum)npt->src_pfx.in6.s6_addr16[i]);
29+
dst_sum = csum_add(dst_sum,
30+
(__force __wsum)npt->dst_pfx.in6.s6_addr16[i]);
5031
}
5132

52-
npt->adjustment = csum16_sub(src_sum, dst_sum);
33+
npt->adjustment = (__force __sum16) csum_sub(src_sum, dst_sum);
5334
return 0;
5435
}
5536

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

88-
sum = csum16_add((__force __sum16)addr->s6_addr16[idx],
69+
sum = (__force __sum16) csum_add((__force __wsum)addr->s6_addr16[idx],
8970
npt->adjustment);
9071
if (sum == CSUM_MANGLED_0)
9172
sum = 0;

‎net/netfilter/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,9 @@ config NETFILTER_XT_TARGET_NFQUEUE
682682

683683
config NETFILTER_XT_TARGET_NOTRACK
684684
tristate '"NOTRACK" target support (DEPRECATED)'
685+
depends on NF_CONNTRACK
686+
depends on IP_NF_RAW || IP6_NF_RAW
687+
depends on NETFILTER_ADVANCED
685688
select NETFILTER_XT_TARGET_CT
686689

687690
config NETFILTER_XT_TARGET_RATEEST

‎net/netfilter/xt_recent.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <linux/skbuff.h>
3030
#include <linux/inet.h>
3131
#include <linux/slab.h>
32+
#include <linux/vmalloc.h>
3233
#include <net/net_namespace.h>
3334
#include <net/netns/generic.h>
3435

@@ -310,6 +311,14 @@ recent_mt(const struct sk_buff *skb, struct xt_action_param *par)
310311
return ret;
311312
}
312313

314+
static void recent_table_free(void *addr)
315+
{
316+
if (is_vmalloc_addr(addr))
317+
vfree(addr);
318+
else
319+
kfree(addr);
320+
}
321+
313322
static int recent_mt_check(const struct xt_mtchk_param *par,
314323
const struct xt_recent_mtinfo_v1 *info)
315324
{
@@ -322,6 +331,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
322331
#endif
323332
unsigned int i;
324333
int ret = -EINVAL;
334+
size_t sz;
325335

326336
if (unlikely(!hash_rnd_inited)) {
327337
get_random_bytes(&hash_rnd, sizeof(hash_rnd));
@@ -360,8 +370,11 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
360370
goto out;
361371
}
362372

363-
t = kzalloc(sizeof(*t) + sizeof(t->iphash[0]) * ip_list_hash_size,
364-
GFP_KERNEL);
373+
sz = sizeof(*t) + sizeof(t->iphash[0]) * ip_list_hash_size;
374+
if (sz <= PAGE_SIZE)
375+
t = kzalloc(sz, GFP_KERNEL);
376+
else
377+
t = vzalloc(sz);
365378
if (t == NULL) {
366379
ret = -ENOMEM;
367380
goto out;
@@ -377,14 +390,14 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
377390
uid = make_kuid(&init_user_ns, ip_list_uid);
378391
gid = make_kgid(&init_user_ns, ip_list_gid);
379392
if (!uid_valid(uid) || !gid_valid(gid)) {
380-
kfree(t);
393+
recent_table_free(t);
381394
ret = -EINVAL;
382395
goto out;
383396
}
384397
pde = proc_create_data(t->name, ip_list_perms, recent_net->xt_recent,
385398
&recent_mt_fops, t);
386399
if (pde == NULL) {
387-
kfree(t);
400+
recent_table_free(t);
388401
ret = -ENOMEM;
389402
goto out;
390403
}
@@ -435,7 +448,7 @@ static void recent_mt_destroy(const struct xt_mtdtor_param *par)
435448
remove_proc_entry(t->name, recent_net->xt_recent);
436449
#endif
437450
recent_table_flush(t);
438-
kfree(t);
451+
recent_table_free(t);
439452
}
440453
mutex_unlock(&recent_mutex);
441454
}

0 commit comments

Comments
 (0)