aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-02-04 10:19:28 +0000
committerJonas Gorski <jogo@openwrt.org>2013-02-04 10:19:28 +0000
commit34ad8f4e75670a4254550fd7b3d6c16046ca6ba6 (patch)
tree5d4955f7c4971cbf9ac5832c26f0c60b99a71c37 /target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
parenta15e1a950d88bbc5a85b0a507b89e132e8bfd79b (diff)
downloadupstream-34ad8f4e75670a4254550fd7b3d6c16046ca6ba6.tar.gz
upstream-34ad8f4e75670a4254550fd7b3d6c16046ca6ba6.tar.bz2
upstream-34ad8f4e75670a4254550fd7b3d6c16046ca6ba6.zip
kernel: generic: update to 3.8-rc6
Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 35478
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 ded6f5f153..0081da01df 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) {