3.18-stable patches

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

diff --git a/queue-3.18/series b/queue-3.18/series
index b025b7c104e7be5f002c08ad01b348328d7552bc..f3a279da131e103084f0a64ff4bfebbfd68e2ef5 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -33,3 +33,4 @@ reiserfs-fix-race-in-prealloc-discard.patch
 reiserfs-don-t-preallocate-blocks-for-extended-attributes.patch
 fs-fcntl-f_setown-avoid-undefined-behaviour.patch
 scsi-libiscsi-fix-shifting-of-did_requeue-host-byte.patch
+um-link-vmlinux-with-no-pie.patch

diff --git a/queue-3.18/um-link-vmlinux-with-no-pie.patch b/queue-3.18/um-link-vmlinux-with-no-pie.patch
new file mode 100644 (file)
index 0000000..2266a00
--- /dev/null
+++ b/queue-3.18/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
+@@ -116,7 +116,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,) \