aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-08-10 11:37:21 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-08-10 11:37:21 +0000
commitd558e581728506d873d62c9bfe48495c0d019535 (patch)
tree3cd327b1399890ecd5faf93032d7d1d7adbf815b /target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch
parent7bf9c1df4745ec7de7b17e0796186cbeeed7287f (diff)
downloadmaster-187ad058-d558e581728506d873d62c9bfe48495c0d019535.tar.gz
master-187ad058-d558e581728506d873d62c9bfe48495c0d019535.tar.bz2
master-187ad058-d558e581728506d873d62c9bfe48495c0d019535.zip
[kernel] add ignore_oc in struct ehci_hcd
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27945 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch')
-rw-r--r--target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch
index 98c28c7433..c834beedd6 100644
--- a/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch
+++ b/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch
@@ -76,10 +76,11 @@
counters = alloc_counters(table);
if (IS_ERR(counters))
-@@ -967,6 +996,14 @@ copy_entries_to_user(unsigned int total_
+@@ -966,6 +995,14 @@ copy_entries_to_user(unsigned int total_
+ ret = -EFAULT;
goto free_counters;
}
-
++
+ flags = e->ip.flags & IPT_F_MASK;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
@@ -87,7 +88,6 @@
+ ret = -EFAULT;
+ goto free_counters;
+ }
-+
+
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
- i += m->u.match_size) {