summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-07-15 15:12:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-07-15 15:12:37 +0000
commit3197479290dbb7d7a081d65d2b64da36698d4408 (patch)
treec1c36b5131b94038112b79e0038f681b81f8e88c /target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
parenta6db996b134ba48805bca692b904ef7805711e8c (diff)
downloadmtk-20170518-3197479290dbb7d7a081d65d2b64da36698d4408.zip
mtk-20170518-3197479290dbb7d7a081d65d2b64da36698d4408.tar.gz
mtk-20170518-3197479290dbb7d7a081d65d2b64da36698d4408.tar.bz2
kernel: refresh 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37348
Diffstat (limited to 'target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch')
-rw-r--r--target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
index 11595a1..140889d 100644
--- a/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
+++ b/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
@@ -76,11 +76,10 @@
counters = alloc_counters(table);
if (IS_ERR(counters))
-@@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_
- ret = -EFAULT;
+@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_
goto free_counters;
}
-+
+
+ flags = e->ip.flags & IPT_F_MASK;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
@@ -88,6 +87,7 @@
+ ret = -EFAULT;
+ goto free_counters;
+ }
-
++
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
+ i += m->u.match_size) {