aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-12-07 16:12:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-12-07 16:12:44 +0000
commit563f963b1b0d11a256aa2be2afebe9fe97673825 (patch)
treee80dd999e69e49094cfb15079c6cb3fd165f6790 /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
parent8e738da02c77b69d2fa8c1ef52faf2af6388b916 (diff)
downloadupstream-563f963b1b0d11a256aa2be2afebe9fe97673825.tar.gz
upstream-563f963b1b0d11a256aa2be2afebe9fe97673825.tar.bz2
upstream-563f963b1b0d11a256aa2be2afebe9fe97673825.zip
kernel: refresh patches for kernel 3.18
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43536
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) {