diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-05-23 13:17:32 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-05-23 13:17:32 +0000 |
commit | 3e4f6af8a5cf99e178706b4490a3ab96cdc34362 (patch) | |
tree | 9280fa304484f75dbc9faf4e52b99f9e52ef3608 /target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch | |
parent | b18a1d217ba9a6516c195339e9f4dde3e0a7f3ce (diff) | |
download | upstream-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.tar.gz upstream-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.tar.bz2 upstream-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.zip |
generic-2.6: refresh patches
SVN-Revision: 21542
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch index ca64e6c3ef..e99c6db4d1 100644 --- a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch +++ b/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch @@ -127,11 +127,10 @@ e = (struct ipt_entry *)(loc_cpu_entry + off); if (copy_to_user(userptr + off -@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_ - ret = -EFAULT; +@@ -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), @@ -139,6 +138,7 @@ + ret = -EFAULT; + goto free_counters; + } - ++ for (i = sizeof(struct ipt_entry); i < e->target_offset; + i += m->u.match_size) { |