diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-08-25 19:56:03 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-08-25 19:56:03 +0000 |
| commit | 233675f1cbe16f09b088459909c899da3edf776c (patch) | |
| tree | b786f9afe82ef8da922243e09ea8b24fcc34230b /target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch | |
| parent | 55bd749a6c4fd2b410be305e62fd5e0111fca3b1 (diff) | |
| download | master-187ad058-233675f1cbe16f09b088459909c899da3edf776c.tar.gz master-187ad058-233675f1cbe16f09b088459909c899da3edf776c.tar.bz2 master-187ad058-233675f1cbe16f09b088459909c899da3edf776c.zip | |
[kernel] refresh 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22799 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch index cd840cdc21..7affbb1221 100644 --- a/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch +++ b/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch @@ -132,11 +132,10 @@ e = (struct ipt_entry *)(loc_cpu_entry + off); if (copy_to_user(userptr + off -@@ -979,6 +1020,14 @@ copy_entries_to_user(unsigned int total_ - ret = -EFAULT; +@@ -980,6 +1021,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), @@ -144,6 +143,7 @@ + ret = -EFAULT; + goto free_counters; + } - ++ for (i = sizeof(struct ipt_entry); i < e->target_offset; + i += m->u.match_size) { |