Netfilter trivial fixes:

- net/core/netfilter.c (overlap): Overlap calculation error.
- net/ipv6/netfilter/ip6_tables.c: Misplaced parentheses leads
to pointer calculation error on SMP.

diff --git a/net/core/netfilter.c b/net/core/netfilter.c
index 8d1e617fc67b0700cd5e5c5a21e4a4d2036d9357..816c063896d9fe319f07d23512f4d637642b031d 100644 (file)
--- a/net/core/netfilter.c
+++ b/net/core/netfilter.c
@@ -83,8 +83,7 @@ void nf_unregister_hook(struct nf_hook_ops *reg)
 /* Do exclusive ranges overlap? */
 static inline int overlap(int min1, int max1, int min2, int max2)
 {
-       return (min1 >= min2 && min1 < max2)
-               || (max1 > min2 && max1 <= max2);
+       return max1 > min2 && min1 < max2;
 }
 
 /* Functions to register sockopt ranges (exclusive). */

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 4cf0325196dc6b9cd5379a15af8dcec0d09c6499..df14640c4528000c4e555b8bb35ac9c6d5908094 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -914,7 +914,7 @@ translate_table(const char *name,
 
        /* And one copy for every other CPU */
        for (i = 1; i < smp_num_cpus; i++) {
-               memcpy(newinfo->entries + SMP_ALIGN(newinfo->size*i),
+               memcpy(newinfo->entries + SMP_ALIGN(newinfo->size)*i,
                       newinfo->entries,
                       SMP_ALIGN(newinfo->size));
        }