projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: refresh patches
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.14
/
610-netfilter_match_bypass_default_checks.patch
diff --git
a/target/linux/generic/patches-3.14/610-netfilter_match_bypass_default_checks.patch
b/target/linux/generic/patches-3.14/610-netfilter_match_bypass_default_checks.patch
index
358d64b
..
f652daf
100644
(file)
--- a/
target/linux/generic/patches-3.14/610-netfilter_match_bypass_default_checks.patch
+++ b/
target/linux/generic/patches-3.14/610-netfilter_match_bypass_default_checks.patch
@@
-76,11
+76,10
@@
counters = alloc_counters(table);
if (IS_ERR(counters))
counters = alloc_counters(table);
if (IS_ERR(counters))
-@@ -965,6 +994,14 @@ copy_entries_to_user(unsigned int total_
- ret = -EFAULT;
+@@ -966,6 +995,14 @@ copy_entries_to_user(unsigned int total_
goto free_counters;
}
goto free_counters;
}
-+
+
+ flags = e->ip.flags & IPT_F_MASK;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
+ 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;
+ }
+ ret = -EFAULT;
+ goto free_counters;
+ }
-
++
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
+ i += m->u.match_size) {