Skip to contentSkip to conversation

Patch "um: Don't discard .text.exit section" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 2, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

um: Don't discard .text.exit section

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
um-don-t-discard-.text.exit-section.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From dad2232844073295c64e9cc2d734a0ade043e0f6 Mon Sep 17 00:00:00 2001

From: Andrey Ryabinin <[email protected]>
Date: Wed, 17 Aug 2016 18:10:11 +0300
Subject: um: Don't discard .text.exit section

From: Andrey Ryabinin <[email protected]>

commit dad2232844073295c64e9cc2d734a0ade043e0f6 upstream.

Commit e41f501d3912 ("vmlinux.lds: account for destructor sections") added '.text.exit' to EXIT_TEXT which is discarded at link time by default. This breaks compilation of UML:
.text.exit' referenced in section .fini_array' of /usr/lib/gcc/x86_64-linux-gnu/6/../../../x86_64-linux-gnu/libc.a(sdlerror.o):
defined in discarded section `.text.exit' of /usr/lib/gcc/x86_64-linux-gnu/6/../../../x86_64-linux-gnu/libc.a(sdlerror.o)

Apparently UML doesn't want to discard exit text, so let's place all EXIT_TEXT sections in .exit.text.

Fixes e41f501d3912 ("vmlinux.lds: account for destructor sections")
---
 arch/um/include/asm/common.lds.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/include/asm/common.lds.S +1 -1
@@ -81,7 +81,7 @@
   .altinstr_replacement : { *(.altinstr_replacement) }
   /* .exit.text is discard at runtime, not link time, to deal with references
      from .altinstructions and .eh_frame */
-  .exit.text : { *(.exit.text) }
+  .exit.text : { EXIT_TEXT }
   .exit.data : { *(.exit.data) }
 
   .preinit_array : {

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/um-don-t-discard-.text.exit-section.patch