diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-10-05 08:50:54 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-10-05 08:50:54 +0000 |
| commit | 11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da (patch) | |
| tree | cdfe45082cf11d9c3d0d51f1315c08b833b4813f /target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch | |
| parent | 978ecae6855efdd2806c2975b85b22c9b2833862 (diff) | |
| download | upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.gz upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.bz2 upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.zip | |
linux/generic: refresh 2.6.36 kernel patches
SVN-Revision: 23237
Diffstat (limited to 'target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch index 7affbb1221..b146502f01 100644 --- a/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch +++ b/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch @@ -124,7 +124,7 @@ pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n", table->name, hook, origptr, get_entry(table_base, private->underflow[hook])); -@@ -970,6 +1010,7 @@ copy_entries_to_user(unsigned int total_ +@@ -974,6 +1014,7 @@ copy_entries_to_user(unsigned int total_ unsigned int i; const struct ipt_entry_match *m; const struct ipt_entry_target *t; @@ -132,10 +132,11 @@ e = (struct ipt_entry *)(loc_cpu_entry + off); if (copy_to_user(userptr + off -@@ -980,6 +1021,14 @@ copy_entries_to_user(unsigned int total_ +@@ -983,6 +1024,14 @@ copy_entries_to_user(unsigned int total_ + ret = -EFAULT; goto free_counters; } - ++ + flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH; + if (copy_to_user(userptr + off + + offsetof(struct ipt_entry, ip.flags), @@ -143,7 +144,6 @@ + ret = -EFAULT; + goto free_counters; + } -+ + for (i = sizeof(struct ipt_entry); i < e->target_offset; - i += m->u.match_size) { |