Skip to content

Commit d873a36

Browse files
ammarfaizi2t-8ch
authored andcommitted
tools/nolibc: i386: Fix a stack misalign bug on _start
The ABI mandates that the %esp register must be a multiple of 16 when executing a 'call' instruction. Commit 2ab4463 ("tools/nolibc: i386: shrink _start with _start_c") simplified the _start function, but it didn't take care of the %esp alignment, causing SIGSEGV on SSE and AVX programs that use aligned move instruction (e.g., movdqa, movaps, and vmovdqa). The 'and $-16, %esp' aligns the %esp at a multiple of 16. Then 'push %eax' will subtract the %esp by 4; thus, it breaks the 16-byte alignment. Make sure the %esp is correctly aligned after the push by subtracting 12 before the push. Extra: Add 'add $12, %esp' before the 'and $-16, %esp' to avoid over-estimating for particular cases as suggested by Willy. A test program to validate the %esp alignment on _start can be found at: https://lore.kernel.org/lkml/ZOoindMFj1UKqo+s@biznet-home.integral.gnuweeb.org [ Thomas: trim Fixes tag commit id ] Cc: Zhangjin Wu <falcon@tinylab.org> Fixes: 2ab4463 ("tools/nolibc: i386: shrink _start with _start_c") Reported-by: Nicholas Rosenberg <inori@vnlx.org> Acked-by: Thomas Weißschuh <linux@weissschuh.net> Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org> Reviewed-by: Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org> Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
1 parent 0bb80ec commit d873a36

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tools/include/nolibc/arch-i386.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ void __attribute__((weak, noreturn, optimize("Os", "omit-frame-pointer"))) __no_
167167
__asm__ volatile (
168168
"xor %ebp, %ebp\n" /* zero the stack frame */
169169
"mov %esp, %eax\n" /* save stack pointer to %eax, as arg1 of _start_c */
170-
"and $-16, %esp\n" /* last pushed argument must be 16-byte aligned */
170+
"add $12, %esp\n" /* avoid over-estimating after the 'and' & 'sub' below */
171+
"and $-16, %esp\n" /* the %esp must be 16-byte aligned on 'call' */
172+
"sub $12, %esp\n" /* sub 12 to keep it aligned after the push %eax */
171173
"push %eax\n" /* push arg1 on stack to support plain stack modes too */
172174
"call _start_c\n" /* transfer to c runtime */
173175
"hlt\n" /* ensure it does not return */

0 commit comments

Comments
 (0)