Skip to contentSkip to conversation

um: CONFIG_STATIC_LINK=y broken

PATCH RESEND New Richard Weinberger 1 participant 1 message Oct 17, 2010 User-mode Linux (UML)

lore
Share & tools
lore

Richard Weinberger

author maintainer
#0 lore raw

PATCH RESEND v2 1/1 um: CONFIG_STATIC_LINK=y broken

Andrew,

Please apply this patch.

--
Hi Linus,

The following patch fixes a regression that I caused in 2.6.32 when cleaning up the um architecture's linker scripts.

I've not heard anything from the um maintainers (they have had since Richard Weinberger reported that this patch fixed the problem on December 22), so I'm sending this to you now (and CCing stable@ since it affects 2.6.32).

-Tim Abbott

--

um: remove PAGE_SIZE alignment in linker script causing kernel segfault.

The linker script cleanup that I did in commit 5d150a97f9391f5bcd7ba0d59d7a11c3de3cea80 accidentally introduced an ALIGN(PAGE_SIZE) when converting to use INIT_TEXT_SECTION; Richard Weinberger reported that this causes the kernel to segfault with CONFIG_STATIC_LINK=y.

I'm not certain why this extra alignment is a problem, but it seems likely it is because previously

__init_begin = _stext = _text = _sinittext

and with the extra ALIGN(PAGE_SIZE), _sinittext becomes different from the rest. So there is likely a bug here where something is assuming that _sinittext is the same as one of those other symbols. But reverting the accidental change fixes the regression, so it seems worth committing that now.

---
 arch/um/kernel/uml.lds.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/um/kernel/uml.lds.S +1 -1
index e7a6cca..664f942 100644
@@ -22,7 +22,7 @@ SECTIONS
   _text = .;
   _stext = .;
   __init_begin = .;
-  INIT_TEXT_SECTION(PAGE_SIZE)
+  INIT_TEXT_SECTION(0)
   . = ALIGN(PAGE_SIZE);
 
   .text      :
Signature · 5 lines
1.6.5.7

-- 
Thanks,
//richard