kernel: merge regression fixes for the netfilter patches to the 3.1 kernel patches...

[openwrt/staging/dedeckeh.git] / target / linux / generic / patches-3.1 / 612-netfilter_match_reduce_memory_access.patch

diff --git a/target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch
index 817b37efd15b55934e25cf111ae5b375324dbf87..f506165e1d3639f3c1c2cc88753cc0ddb529f5be 100644 (file)
--- a/target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch
+++ b/target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch
@@ -9,7 +9,7 @@
 +                (ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
                  IPT_INV_SRCIP) ||
 -          FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-+          FWINV(ipinfo->smsk.s_addr &&
++          FWINV(ipinfo->dmsk.s_addr &&
 +                (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
                  IPT_INV_DSTIP)) {
                dprintf("Source or dest mismatch.\n");