diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-07-22 15:31:13 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-07-22 15:31:13 +0000 |
| commit | ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92 (patch) | |
| tree | 111f67b615233af594bc5e29460af254bf85274e /target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch | |
| parent | 6a5b4ec7dc2abeecd47345e2fb5aeb83ea50f322 (diff) | |
| download | mtk-20170518-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.zip mtk-20170518-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.tar.gz mtk-20170518-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.tar.bz2 | |
kernel: update 3.10 to 3.10.2
Also refresh 3.10 patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37502
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 140889d..11595a1 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,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) { |