diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-07-15 15:12:37 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-15 15:12:37 +0000 |
commit | 3197479290dbb7d7a081d65d2b64da36698d4408 (patch) | |
tree | c1c36b5131b94038112b79e0038f681b81f8e88c /target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch | |
parent | a6db996b134ba48805bca692b904ef7805711e8c (diff) | |
download | upstream-3197479290dbb7d7a081d65d2b64da36698d4408.tar.gz upstream-3197479290dbb7d7a081d65d2b64da36698d4408.tar.bz2 upstream-3197479290dbb7d7a081d65d2b64da36698d4408.zip |
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.patch | 8 |
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 11595a18da..140889d867 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) { |