diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-12-07 16:12:44 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-12-07 16:12:44 +0000 |
| commit | ecc2fb197c819bdf1b6c7748364c02152601d99e (patch) | |
| tree | c30364bea3c907947b4124998f5ca96653d33a05 /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch | |
| parent | 5b0c81ab74b76a53f58a53a6048747fb63a6abcb (diff) | |
| download | master-187ad058-ecc2fb197c819bdf1b6c7748364c02152601d99e.tar.gz master-187ad058-ecc2fb197c819bdf1b6c7748364c02152601d99e.tar.bz2 master-187ad058-ecc2fb197c819bdf1b6c7748364c02152601d99e.zip | |
kernel: refresh patches for kernel 3.18
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43536 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 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) { |