summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-02-04 10:19:28 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-02-04 10:19:28 +0000
commitfa5566503f562220ba777250aaef3afcee31c8e6 (patch)
treecb6c6f12f0251a9f69ba6602e85d58df75127d29 /target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
parent3afd4a3ccf330fcbf92192a20ff1a3c75a6b76a0 (diff)
kernel: generic: update to 3.8-rc6
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35478 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch')
-rw-r--r--target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
index ded6f5f15..0081da01d 100644
--- a/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
+++ b/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
@@ -76,10 +76,11 @@
counters = alloc_counters(table);
if (IS_ERR(counters))
-@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_
+@@ -960,6 +989,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) {