diff options
author | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:43 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:43 +0000 |
commit | cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4 (patch) | |
tree | f0d9e62c746434dde7a45ed0debd3eb94b92dc65 /target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch | |
parent | a5f2fd63598414246a497e08a4433a0116f2f606 (diff) | |
download | master-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.gz master-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.bz2 master-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.zip |
linux: generic: add support for 3.1-rc1
SVN-Revision: 27940
Diffstat (limited to 'target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch')
-rw-r--r-- | target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/patches-3.1/612-netfilter_match_reduce_memory_access.patch new file mode 100644 index 0000000000..817b37efd1 --- /dev/null +++ b/target/linux/generic/patches-3.1/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->smsk.s_addr && ++ (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr, + IPT_INV_DSTIP)) { + dprintf("Source or dest mismatch.\n"); + |