summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.9/612-netfilter_match_reduce_memory_access.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-14 14:45:56 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-14 14:45:56 +0000
commit05ea13b746e715f03c70e29068b650a62e5e5d79 (patch)
tree08d6be7813310be182259388518215a17afcc18c /target/linux/generic/patches-3.9/612-netfilter_match_reduce_memory_access.patch
parent54d0b82f17bde2e67b8a2b58c1cb3e9ba294e9b7 (diff)
kernel: add support for 3.9-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36008 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 000000000..f506165e1
--- /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");
+