[packages/kernel/LINUX_4_1] - up to 4.1.30

[arekm]

commit 63692ea23cb2e002f0855869e6c87fa771b4bd56
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Aug 10 23:35:19 2016 +0200

    - up to 4.1.30

 kernel-small_fixes.patch | 114 -----------------------------------------------
 kernel.spec              |   4 +-
 2 files changed, 2 insertions(+), 116 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 4cc8605..ee696e0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define		rel		1
 %define		basever		4.1
-%define		postver		.29
+%define		postver		.30
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -119,7 +119,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5:	fe9dc0f6729f36400ea81aa41d614c37
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	bb1fe8e9d66bd187bbb39c9388c44043
+# Patch0-md5:	c24bf5095a53863c5c28e33d0d606f95
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 801ce61..0a5d601 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -113,118 +113,4 @@ index 29531ec..65fbfb7 100644
  	if (!mp->m_eofblocks_workqueue)
  		goto out_destroy_log;
  
--- 
-cgit v0.11.2
 
-From patchwork Tue Jul 19 11:07:16 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [stable-4.1,v2] netfilter: x_tables: fix stable backport
-From: =?utf-8?q?Michal_Kube=C4=8Dek?= <mkubecek at suse.cz>
-X-Patchwork-Id: 650120
-X-Patchwork-Delegate: davem at davemloft.net
-Message-Id: <20160719110716.C5910A0EB7 at unicorn.suse.cz>
-To: Sasha Levin <sasha.levin at oracle.com>
-Cc: stable at vger.kernel.org, netfilter-devel at vger.kernel.org,
- netdev at vger.kernel.org, Florian Westphal <fw at strlen.de>,
- Takashi Iwai <tiwai at suse.de>
-Date: Tue, 19 Jul 2016 13:07:16 +0200 (CEST)
-
-Stable-4.1 backport of mainline commit 364723410175 ("netfilter:
-x_tables: validate targets of jumps") doesn't handle correctly the fact
-that 4.1 kernel is missing commit 482cfc318559 ("netfilter: xtables:
-avoid percpu ruleset duplication") so that t->entries is still a per-cpu
-array in find_jump_target().
-
-Use the same fix as e.g. stable-3.14 backport.
-
-Fixes: 8163327a3a92 ("netfilter: x_tables: validate targets of jumps")
-Signed-off-by: Michal Kubecek <mkubecek at suse.cz>
----
- net/ipv4/netfilter/arp_tables.c | 5 +++--
- net/ipv4/netfilter/ip_tables.c  | 5 +++--
- net/ipv6/netfilter/ip6_tables.c | 5 +++--
- 3 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
-index 2953ee9e5fa0..49e145640ee7 100644
---- a/net/ipv4/netfilter/arp_tables.c
-+++ b/net/ipv4/netfilter/arp_tables.c
-@@ -363,11 +363,12 @@ static inline bool unconditional(const struct arpt_entry *e)
- }
- 
- static bool find_jump_target(const struct xt_table_info *t,
-+			     const void *entry0,
- 			     const struct arpt_entry *target)
- {
- 	struct arpt_entry *iter;
- 
--	xt_entry_foreach(iter, t->entries, t->size) {
-+	xt_entry_foreach(iter, entry0, t->size) {
- 		 if (iter == target)
- 			return true;
- 	}
-@@ -469,7 +470,7 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
- 						 pos, newpos);
- 					e = (struct arpt_entry *)
- 						(entry0 + newpos);
--					if (!find_jump_target(newinfo, e))
-+					if (!find_jump_target(newinfo, entry0, e))
- 						return 0;
- 				} else {
- 					/* ... this is a fallthru */
-diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
-index 3bcf28bf1525..52a883645899 100644
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -439,11 +439,12 @@ ipt_do_table(struct sk_buff *skb,
- }
- 
- static bool find_jump_target(const struct xt_table_info *t,
-+			     const void *entry0,
- 			     const struct ipt_entry *target)
- {
- 	struct ipt_entry *iter;
- 
--	xt_entry_foreach(iter, t->entries, t->size) {
-+	xt_entry_foreach(iter, entry0, t->size) {
- 		 if (iter == target)
- 			return true;
- 	}
-@@ -549,7 +550,7 @@ mark_source_chains(const struct xt_table_info *newinfo,
- 						 pos, newpos);
- 					e = (struct ipt_entry *)
- 						(entry0 + newpos);
--					if (!find_jump_target(newinfo, e))
-+					if (!find_jump_target(newinfo, entry0, e))
- 						return 0;
- 				} else {
- 					/* ... this is a fallthru */
-diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
-index 5254d76dfce8..b77bf6dab70c 100644
---- a/net/ipv6/netfilter/ip6_tables.c
-+++ b/net/ipv6/netfilter/ip6_tables.c
-@@ -452,11 +452,12 @@ ip6t_do_table(struct sk_buff *skb,
- }
- 
- static bool find_jump_target(const struct xt_table_info *t,
-+			     const void *entry0,
- 			     const struct ip6t_entry *target)
- {
- 	struct ip6t_entry *iter;
- 
--	xt_entry_foreach(iter, t->entries, t->size) {
-+	xt_entry_foreach(iter, entry0, t->size) {
- 		 if (iter == target)
- 			return true;
- 	}
-@@ -562,7 +563,7 @@ mark_source_chains(const struct xt_table_info *newinfo,
- 						 pos, newpos);
- 					e = (struct ip6t_entry *)
- 						(entry0 + newpos);
--					if (!find_jump_target(newinfo, e))
-+					if (!find_jump_target(newinfo, entry0, e))
- 						return 0;
- 				} else {
- 					/* ... this is a fallthru */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/63692ea23cb2e002f0855869e6c87fa771b4bd56