aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.9/612-netfilter_match_reduce_memory_access.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-03-14 14:45:56 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-03-14 14:45:56 +0000
commitb2e63b8ea81fae72aef69649631cf491bac5306f (patch)
tree9a4bc7d83c339b4b842999287e3ae5e5d5d6734a /target/linux/generic/patches-3.9/612-netfilter_match_reduce_memory_access.patch
parent32f3b1e3582701ef6c8c248b9ad0a761c42bbc1b (diff)
downloadupstream-b2e63b8ea81fae72aef69649631cf491bac5306f.tar.gz
upstream-b2e63b8ea81fae72aef69649631cf491bac5306f.tar.bz2
upstream-b2e63b8ea81fae72aef69649631cf491bac5306f.zip
kernel: add support for 3.9-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 36008
Diffstat (limited to 'target/linux/generic/patches-3.9/612-netfilter_match_reduce_memory_access.patch')
-rw-r--r--target/linux/generic/patches-3.9/612-netfilter_match_reduce_memory_access.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.9/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/patches-3.9/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 0000000000..f506165e1d
--- /dev/null
+++ b/target/linux/generic/patches-3.9/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");
+