aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/612-netfilter_match_reduce_memory_access.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-10-23 12:21:34 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-10-23 12:21:34 +0000
commit949b46d13d1e21b596f505a2e69956565e365d77 (patch)
tree4b51f4852224df7cc2d056071ee51bfcb9c5b7f4 /target/linux/generic/patches-3.6/612-netfilter_match_reduce_memory_access.patch
parent0d2cf5f9e363c8e41b32921b0ab2aa3d4621dfd5 (diff)
downloadupstream-949b46d13d1e21b596f505a2e69956565e365d77.tar.gz
upstream-949b46d13d1e21b596f505a2e69956565e365d77.tar.bz2
upstream-949b46d13d1e21b596f505a2e69956565e365d77.zip
linux 3.6 support (work in progress)
SVN-Revision: 33897
Diffstat (limited to 'target/linux/generic/patches-3.6/612-netfilter_match_reduce_memory_access.patch')
-rw-r--r--target/linux/generic/patches-3.6/612-netfilter_match_reduce_memory_access.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.6/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/patches-3.6/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 0000000000..f506165e1d
--- /dev/null
+++ b/target/linux/generic/patches-3.6/612-netfilter_match_reduce_memory_access.patch
@@ -0,0 +1,16 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -84,9 +84,11 @@ ip_packet_match(const struct iphdr *ip,
+ if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
+ return true;
+
+- if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
++ if (FWINV(ipinfo->smsk.s_addr &&
++ (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->dmsk.s_addr &&
++ (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+ IPT_INV_DSTIP)) {
+ dprintf("Source or dest mismatch.\n");
+