diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-08-31 14:08:30 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-08-31 14:08:30 +0000 |
| commit | 26bcc4b2bfd82252da4b57c72a2d85b2315776d6 (patch) | |
| tree | 0c79856c3fe3f55ea97dbd1d0c4300cd3ba5b7ee /target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch | |
| parent | 2ef5ba18136e4ec0956f7dc42168024f2a3f867c (diff) | |
| download | master-187ad058-26bcc4b2bfd82252da4b57c72a2d85b2315776d6.tar.gz master-187ad058-26bcc4b2bfd82252da4b57c72a2d85b2315776d6.tar.bz2 master-187ad058-26bcc4b2bfd82252da4b57c72a2d85b2315776d6.zip | |
[kernel] refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22848 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch index 04ba710274..a9eb1089f5 100644 --- a/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch +++ b/target/linux/generic/patches-2.6.32/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) { |