diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 13:16:35 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 13:16:35 +0000 |
commit | 712f6ec52abc4e8a04611bda0604dc9e8b658e6f (patch) | |
tree | 173d851fe7a1e8988e0bcf10581f48043ae2e186 /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch | |
parent | 58de4a47597876d9da25d1400b92c5b647fd75bd (diff) | |
download | upstream-712f6ec52abc4e8a04611bda0604dc9e8b658e6f.tar.gz upstream-712f6ec52abc4e8a04611bda0604dc9e8b658e6f.tar.bz2 upstream-712f6ec52abc4e8a04611bda0604dc9e8b658e6f.zip |
kernel: update linux 3.18 to final release
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43569
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 358d64b1a1..f652dafd18 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,11 +76,10 @@ 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; } -+ + + 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) { |