aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.2/612-netfilter_match_reduce_memory_access.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-01-13 14:55:07 +0000
committerJonas Gorski <jogo@openwrt.org>2012-01-13 14:55:07 +0000
commitb49e97601bba8ba4075085b69e00952373e18af2 (patch)
tree322fc313a19bc903c788a7acf9b6fabef06b04e5 /target/linux/generic/patches-3.2/612-netfilter_match_reduce_memory_access.patch
parentef7ec19360f373ead4bffc66c10fd70ec6c1aa78 (diff)
downloadupstream-b49e97601bba8ba4075085b69e00952373e18af2.tar.gz
upstream-b49e97601bba8ba4075085b69e00952373e18af2.tar.bz2
upstream-b49e97601bba8ba4075085b69e00952373e18af2.zip
kernel: add support for linux 3.2.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29730 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.2/612-netfilter_match_reduce_memory_access.patch')
-rw-r--r--target/linux/generic/patches-3.2/612-netfilter_match_reduce_memory_access.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.2/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/patches-3.2/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 0000000000..f506165e1d
--- /dev/null
+++ b/target/linux/generic/patches-3.2/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");
+