diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-10-27 18:14:39 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-10-27 18:14:39 +0000 |
| commit | 1513b39a8c8e21e3f8fbebab9fb4c41040ccf695 (patch) | |
| tree | 7c786effff410b4a96d29c920d60cd279236fbf7 /target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch | |
| parent | 38e72c779e229933625d96d4355a0250123b6ce5 (diff) | |
| download | master-31e0f0ae-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.gz master-31e0f0ae-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.bz2 master-31e0f0ae-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.zip | |
kernel: start working on 3.18 support
This commit:
1) Copies 3.14 patches
2) Drops mainlined stuff
3) Modifies some patches to apply
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43093
Diffstat (limited to 'target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch new file mode 100644 index 0000000000..72172d8bb4 --- /dev/null +++ b/target/linux/generic/patches-3.18/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"); + |