aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-12-11 23:29:07 +0000
committerLuka Perkov <luka@openwrt.org>2014-12-11 23:29:07 +0000
commit8d698feff86887d5e2d682b5188502505ad9fa00 (patch)
treeb1d1ec71e146154a64b78cce8522eb9f3d7fe22a /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
parent69fc38fe4880411498cc2a6c5a2622dfc7b763d2 (diff)
downloadmaster-187ad058-8d698feff86887d5e2d682b5188502505ad9fa00.tar.gz
master-187ad058-8d698feff86887d5e2d682b5188502505ad9fa00.tar.bz2
master-187ad058-8d698feff86887d5e2d682b5188502505ad9fa00.zip
kernel: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43643 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch')
-rw-r--r--target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
index f652dafd18..358d64b1a1 100644
--- a/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
+++ b/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
@@ -76,10 +76,11 @@
counters = alloc_counters(table);
if (IS_ERR(counters))
-@@ -966,6 +995,14 @@ copy_entries_to_user(unsigned int total_
+@@ -965,6 +994,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) {