diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2012-11-18 18:52:38 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2012-11-18 18:52:38 +0000 |
| commit | 43d2eb64ccb3a223ba2244faee1280aaa6f68d11 (patch) | |
| tree | 86525769ccc1e76c33de9d10b51d14bdc0e1c8f7 /target/linux/generic/patches-3.7/612-netfilter_match_reduce_memory_access.patch | |
| parent | 2b0cba675561342a1a538bad8a7df10cf855323e (diff) | |
| download | upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.gz upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.bz2 upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.zip | |
[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34247 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7/612-netfilter_match_reduce_memory_access.patch')
| -rw-r--r-- | target/linux/generic/patches-3.7/612-netfilter_match_reduce_memory_access.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/patches-3.7/612-netfilter_match_reduce_memory_access.patch new file mode 100644 index 0000000000..f506165e1d --- /dev/null +++ b/target/linux/generic/patches-3.7/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"); + |