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 | 3a5b58926135e0877db5a01807fcab5b3122ffc8 (patch) | |
| tree | 5c9a6016a1bff356b44ee4f9b5944af0b43b8adf /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch | |
| parent | 6ab5d707ffe45e54fe29bcef403d08e75a521352 (diff) | |
| download | master-187ad058-3a5b58926135e0877db5a01807fcab5b3122ffc8.tar.gz master-187ad058-3a5b58926135e0877db5a01807fcab5b3122ffc8.tar.bz2 master-187ad058-3a5b58926135e0877db5a01807fcab5b3122ffc8.zip | |
kernel: update linux 3.18 to final release
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43569 3c298f89-4303-0410-b956-a3cf2f4a3e73
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) { |