diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-28 19:59:28 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-28 19:59:28 +0000 |
| commit | 0dc7fb2669e5eebf487494243b15f82b1addf206 (patch) | |
| tree | 146f2b183659f48d2a93f76abd0a343f6b486717 /target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch | |
| parent | f19762f44dfbe3daaedf4613f88c0afd85da3723 (diff) | |
[kernel] refresh 2.6.31 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21240 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch index d6c113aa3..bcc1878c9 100644 --- a/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch +++ b/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch @@ -127,10 +127,11 @@ e = (struct ipt_entry *)(loc_cpu_entry + off); if (copy_to_user(userptr + off -@@ -988,6 +1028,14 @@ copy_entries_to_user(unsigned int total_ +@@ -987,6 +1027,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), @@ -138,7 +139,6 @@ + ret = -EFAULT; + goto free_counters; + } -+ + for (i = sizeof(struct ipt_entry); i < e->target_offset; - i += m->u.match_size) { |