aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.19/612-netfilter_match_reduce_memory_access.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-01-25 15:20:39 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-01-25 15:20:39 +0000
commiteac842c52b28a4fd42082f3ca8231f5874a57361 (patch)
tree514eb8ba16df65dd4b3feeb3c900279596556d09 /target/linux/generic/patches-3.19/612-netfilter_match_reduce_memory_access.patch
parent10c00d28433d42305ead73480465ce87d047a3d2 (diff)
downloadmaster-187ad058-eac842c52b28a4fd42082f3ca8231f5874a57361.tar.gz
master-187ad058-eac842c52b28a4fd42082f3ca8231f5874a57361.tar.bz2
master-187ad058-eac842c52b28a4fd42082f3ca8231f5874a57361.zip
generic: add preliminary 3.19 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44126 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.19/612-netfilter_match_reduce_memory_access.patch')
-rw-r--r--target/linux/generic/patches-3.19/612-netfilter_match_reduce_memory_access.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.19/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/patches-3.19/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 0000000000..72172d8bb4
--- /dev/null
+++ b/target/linux/generic/patches-3.19/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
+@@ -85,9 +85,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");
+