4.9-stable patches

added patches:
	um-link-vmlinux-with-no-pie.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index e5d28602263f7ebb6d6e5541d76da3dde776caa2..e532f4bfe715641a8656524b6c558079e53422a9 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -27,3 +27,4 @@ revert-module-add-retpoline-tag-to-vermagic.patch
 mm-fix-100-cpu-kswapd-busyloop-on-unreclaimable-nodes.patch
 input-trackpoint-force-3-buttons-if-0-button-is-reported.patch
 orangefs-fix-deadlock-do-not-write-i_size-in-read_iter.patch
+um-link-vmlinux-with-no-pie.patch

diff --git a/queue-4.9/um-link-vmlinux-with-no-pie.patch b/queue-4.9/um-link-vmlinux-with-no-pie.patch
new file mode 100644 (file)
index 0000000..919afbd
--- /dev/null
+++ b/queue-4.9/um-link-vmlinux-with-no-pie.patch
@@ -0,0 +1,32 @@
+From 883354afbc109c57f925ccc19840055193da0cc0 Mon Sep 17 00:00:00 2001
+From: Thomas Meyer <thomas@m3y3r.de>
+Date: Sun, 20 Aug 2017 13:26:04 +0200
+Subject: um: link vmlinux with -no-pie
+
+From: Thomas Meyer <thomas@m3y3r.de>
+
+commit 883354afbc109c57f925ccc19840055193da0cc0 upstream.
+
+Debian's gcc defaults to pie. The global Makefile already defines the -fno-pie option.
+Link UML dynamic kernel image also with -no-pie to fix the build.
+
+Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Cc: Bernie Innocenti <codewiz@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/um/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/um/Makefile
++++ b/arch/um/Makefile
+@@ -117,7 +117,7 @@ archheaders:
+ archprepare: include/generated/user_constants.h
+ 
+ LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
+-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
++LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)
+ 
+ CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \
+       $(call cc-option, -fno-stack-protector,) \