diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-12-11 23:29:07 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-12-11 23:29:07 +0000 |
| commit | a3eed6bc3592d61276cff4d97b73dfaf2195d766 (patch) | |
| tree | d8e424244f213a90e47d47e7a35e41394c3131fe /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch | |
| parent | a2a6077fd0c8f12e2c0834615485a99c1a80f2c2 (diff) | |
| download | master-31e0f0ae-a3eed6bc3592d61276cff4d97b73dfaf2195d766.tar.gz master-31e0f0ae-a3eed6bc3592d61276cff4d97b73dfaf2195d766.tar.bz2 master-31e0f0ae-a3eed6bc3592d61276cff4d97b73dfaf2195d766.zip | |
kernel: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 43643
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.patch | 8 |
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) { |