diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-03-28 19:05:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-03-28 19:05:59 +0000 |
| commit | 5f89a1f0965739c67e238f707e4c258e4bb13713 (patch) | |
| tree | 4b3159c27fc8a5db5bdc25114ddd8b10dee93046 /target/linux/generic-2.6/patches-2.6.34 | |
| parent | e4a6acf9b80cd9a9623ce7b697f1fe7455437a76 (diff) | |
| download | upstream-5f89a1f0965739c67e238f707e4c258e4bb13713.tar.gz upstream-5f89a1f0965739c67e238f707e4c258e4bb13713.tar.bz2 upstream-5f89a1f0965739c67e238f707e4c258e4bb13713.zip | |
netfilter: fix ABI breakage caused by the netfilter match optimization (fixes #5628)
SVN-Revision: 20552
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch index 69344a91fa..e99c6db4d1 100644 --- a/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch +++ b/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch @@ -119,3 +119,26 @@ /* For return from builtin chain */ back = get_entry(table_base, private->underflow[hook]); +@@ -992,6 +1031,7 @@ copy_entries_to_user(unsigned int total_ + unsigned int i; + const struct ipt_entry_match *m; + const struct ipt_entry_target *t; ++ u8 flags; + + e = (struct ipt_entry *)(loc_cpu_entry + off); + if (copy_to_user(userptr + off +@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_ + goto free_counters; + } + ++ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH; ++ if (copy_to_user(userptr + off ++ + offsetof(struct ipt_entry, ip.flags), ++ &flags, sizeof(flags)) != 0) { ++ ret = -EFAULT; ++ goto free_counters; ++ } ++ + for (i = sizeof(struct ipt_entry); + i < e->target_offset; + i += m->u.match_size) { |