summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-03 20:02:31 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-03 20:02:31 +0000
commite5fc3fcde56ee2c175721403d8911af3dd589623 (patch)
tree9e52766923242086afe55c54b0480c6e89ae53e7 /target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch
parenta296f5fbac240d39380363d21704110256a9eeb8 (diff)
kernel: merge regression fixes for the netfilter patches to the 3.1 kernel patches (patch by tripolar)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28734 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch')
-rw-r--r--target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch2
1 files changed, 1 insertions, 1 deletions
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 817b37efd..f506165e1 100644
--- 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");