diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-01 17:38:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-01 17:38:54 +0000 |
| commit | d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664 (patch) | |
| tree | 79b063a7c43e138a404575365ae614c85477ccd3 /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch | |
| parent | 70c3a60947cc0b000a4174e65206fe89cb43c7ae (diff) | |
| download | upstream-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.tar.gz upstream-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.tar.bz2 upstream-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.zip | |
kernel: update 3.18 to rc7
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43479
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) { |