diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-04-19 11:38:46 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-04-19 11:38:46 +0000 |
| commit | 025b5cf8bdea775b87a19b80c3a4c8e3b19beec9 (patch) | |
| tree | a4ceeb440e0607a889a5403d4cff15b9664dbd56 /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch | |
| parent | 1da88fdb3e0344c56d40f7ad69ca153a289d9a27 (diff) | |
| download | master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.tar.gz master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.tar.bz2 master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.zip | |
kernel: refresh generic patches
Refresh patches to remove the trailing whitespaces caused by an old
diffutils version on osx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45506 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) { |