aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-03 20:02:31 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-03 20:02:31 +0000
commit82bd0a43f1fbff02da4db38f91751919529944a4 (patch)
treeee586d0cb96c257a515521bb6d8af156f00882b5 /target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch
parent44ba13b57890b62ecd30ba8a7ce2758e5b44ee89 (diff)
downloadupstream-82bd0a43f1fbff02da4db38f91751919529944a4.tar.gz
upstream-82bd0a43f1fbff02da4db38f91751919529944a4.tar.bz2
upstream-82bd0a43f1fbff02da4db38f91751919529944a4.zip
kernel: merge regression fixes for the netfilter patches to the 3.1 kernel patches (patch by tripolar)
SVN-Revision: 28734
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 817b37efd1..f506165e1d 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");