4.4-stable patches

added patches:
	crypto-rsa-add-makefile-dependencies-to-fix-parallel-builds.patch
	hotplug-make-register-and-unregister-notifier-api-symmetric.patch

diff --git a/queue-4.4/crypto-rsa-add-makefile-dependencies-to-fix-parallel-builds.patch b/queue-4.4/crypto-rsa-add-makefile-dependencies-to-fix-parallel-builds.patch
new file mode 100644 (file)
index 0000000..d9168ec
--- /dev/null
+++ b/queue-4.4/crypto-rsa-add-makefile-dependencies-to-fix-parallel-builds.patch
@@ -0,0 +1,31 @@
+From 57891633eeef60e732e045731cf20e50ee80acb4 Mon Sep 17 00:00:00 2001
+From: David Michael <david.michael@coreos.com>
+Date: Tue, 29 Nov 2016 11:15:12 -0800
+Subject: crypto: rsa - Add Makefile dependencies to fix parallel builds
+
+From: David Michael <david.michael@coreos.com>
+
+commit 57891633eeef60e732e045731cf20e50ee80acb4 upstream.
+
+Both asn1 headers are included by rsa_helper.c, so rsa_helper.o
+should explicitly depend on them.
+
+Signed-off-by: David Michael <david.michael@coreos.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Cc: Tuomas Tynkkynen <tuomas@tuxera.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ crypto/Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -33,6 +33,7 @@ obj-$(CONFIG_CRYPTO_AKCIPHER2) += akciph
+ 
+ $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h
+ $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h
++$(obj)/rsa_helper.o: $(obj)/rsapubkey-asn1.h $(obj)/rsaprivkey-asn1.h
+ clean-files += rsapubkey-asn1.c rsapubkey-asn1.h
+ clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h
+ 

diff --git a/queue-4.4/hotplug-make-register-and-unregister-notifier-api-symmetric.patch b/queue-4.4/hotplug-make-register-and-unregister-notifier-api-symmetric.patch
new file mode 100644 (file)
index 0000000..bb90f5a
--- /dev/null
+++ b/queue-4.4/hotplug-make-register-and-unregister-notifier-api-symmetric.patch
@@ -0,0 +1,112 @@
+From 777c6e0daebb3fcefbbd6f620410a946b07ef6d0 Mon Sep 17 00:00:00 2001
+From: Michal Hocko <mhocko@suse.com>
+Date: Wed, 7 Dec 2016 14:54:38 +0100
+Subject: hotplug: Make register and unregister notifier API symmetric
+
+From: Michal Hocko <mhocko@suse.com>
+
+commit 777c6e0daebb3fcefbbd6f620410a946b07ef6d0 upstream.
+
+Yu Zhao has noticed that __unregister_cpu_notifier only unregisters its
+notifiers when HOTPLUG_CPU=y while the registration might succeed even
+when HOTPLUG_CPU=n if MODULE is enabled. This means that e.g. zswap
+might keep a stale notifier on the list on the manual clean up during
+the pool tear down and thus corrupt the list. Resulting in the following
+
+[  144.964346] BUG: unable to handle kernel paging request at ffff880658a2be78
+[  144.971337] IP: [<ffffffffa290b00b>] raw_notifier_chain_register+0x1b/0x40
+<snipped>
+[  145.122628] Call Trace:
+[  145.125086]  [<ffffffffa28e5cf8>] __register_cpu_notifier+0x18/0x20
+[  145.131350]  [<ffffffffa2a5dd73>] zswap_pool_create+0x273/0x400
+[  145.137268]  [<ffffffffa2a5e0fc>] __zswap_param_set+0x1fc/0x300
+[  145.143188]  [<ffffffffa2944c1d>] ? trace_hardirqs_on+0xd/0x10
+[  145.149018]  [<ffffffffa2908798>] ? kernel_param_lock+0x28/0x30
+[  145.154940]  [<ffffffffa2a3e8cf>] ? __might_fault+0x4f/0xa0
+[  145.160511]  [<ffffffffa2a5e237>] zswap_compressor_param_set+0x17/0x20
+[  145.167035]  [<ffffffffa2908d3c>] param_attr_store+0x5c/0xb0
+[  145.172694]  [<ffffffffa290848d>] module_attr_store+0x1d/0x30
+[  145.178443]  [<ffffffffa2b2b41f>] sysfs_kf_write+0x4f/0x70
+[  145.183925]  [<ffffffffa2b2a5b9>] kernfs_fop_write+0x149/0x180
+[  145.189761]  [<ffffffffa2a99248>] __vfs_write+0x18/0x40
+[  145.194982]  [<ffffffffa2a9a412>] vfs_write+0xb2/0x1a0
+[  145.200122]  [<ffffffffa2a9a732>] SyS_write+0x52/0xa0
+[  145.205177]  [<ffffffffa2ff4d97>] entry_SYSCALL_64_fastpath+0x12/0x17
+
+This can be even triggered manually by changing
+/sys/module/zswap/parameters/compressor multiple times.
+
+Fix this issue by making unregister APIs symmetric to the register so
+there are no surprises.
+
+Fixes: 47e627bc8c9a ("[PATCH] hotplug: Allow modules to use the cpu hotplug notifiers even if !CONFIG_HOTPLUG_CPU")
+Reported-and-tested-by: Yu Zhao <yuzhao@google.com>
+Signed-off-by: Michal Hocko <mhocko@suse.com>
+Cc: linux-mm@kvack.org
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Dan Streetman <ddstreet@ieee.org>
+Link: http://lkml.kernel.org/r/20161207135438.4310-1-mhocko@kernel.org
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/cpu.h |   15 ++++-----------
+ kernel/cpu.c        |    3 +--
+ 2 files changed, 5 insertions(+), 13 deletions(-)
+
+--- a/include/linux/cpu.h
++++ b/include/linux/cpu.h
+@@ -131,22 +131,16 @@ enum {
+               { .notifier_call = fn, .priority = pri };       \
+       __register_cpu_notifier(&fn##_nb);                      \
+ }
+-#else /* #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE) */
+-#define cpu_notifier(fn, pri) do { (void)(fn); } while (0)
+-#define __cpu_notifier(fn, pri)       do { (void)(fn); } while (0)
+-#endif /* #else #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE) */
+ 
+-#ifdef CONFIG_HOTPLUG_CPU
+ extern int register_cpu_notifier(struct notifier_block *nb);
+ extern int __register_cpu_notifier(struct notifier_block *nb);
+ extern void unregister_cpu_notifier(struct notifier_block *nb);
+ extern void __unregister_cpu_notifier(struct notifier_block *nb);
+-#else
+ 
+-#ifndef MODULE
+-extern int register_cpu_notifier(struct notifier_block *nb);
+-extern int __register_cpu_notifier(struct notifier_block *nb);
+-#else
++#else /* #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE) */
++#define cpu_notifier(fn, pri) do { (void)(fn); } while (0)
++#define __cpu_notifier(fn, pri)       do { (void)(fn); } while (0)
++
+ static inline int register_cpu_notifier(struct notifier_block *nb)
+ {
+       return 0;
+@@ -156,7 +150,6 @@ static inline int __register_cpu_notifie
+ {
+       return 0;
+ }
+-#endif
+ 
+ static inline void unregister_cpu_notifier(struct notifier_block *nb)
+ {
+--- a/kernel/cpu.c
++++ b/kernel/cpu.c
+@@ -223,8 +223,6 @@ static int cpu_notify(unsigned long val,
+       return __cpu_notify(val, v, -1, NULL);
+ }
+ 
+-#ifdef CONFIG_HOTPLUG_CPU
+-
+ static void cpu_notify_nofail(unsigned long val, void *v)
+ {
+       BUG_ON(cpu_notify(val, v));
+@@ -246,6 +244,7 @@ void __unregister_cpu_notifier(struct no
+ }
+ EXPORT_SYMBOL(__unregister_cpu_notifier);
+ 
++#ifdef CONFIG_HOTPLUG_CPU
+ /**
+  * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU
+  * @cpu: a CPU id

diff --git a/queue-4.4/series b/queue-4.4/series
index 8eee46817d01ee9e19e4054067ef10f0354935d8..35c7bcb3e74d389f8da42ce279b7948a6aa24039 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -12,3 +12,5 @@ can-peak-fix-bad-memory-access-and-free-sequence.patch
 arm64-futex.h-add-missing-pan-toggling.patch
 m68k-fix-ndelay-macro.patch
 batman-adv-check-for-alloc-errors-when-preparing-tt-local-data.patch
+hotplug-make-register-and-unregister-notifier-api-symmetric.patch
+crypto-rsa-add-makefile-dependencies-to-fix-parallel-builds.patch