]> git.ipfire.org Git - thirdparty/glibc.git/commit
x86-64: Fix the dtv field load for x32 [BZ #31184]
authorH.J. Lu <hjl.tools@gmail.com>
Thu, 21 Dec 2023 00:31:43 +0000 (16:31 -0800)
committerH.J. Lu <hjl.tools@gmail.com>
Sat, 23 Dec 2023 17:04:14 +0000 (09:04 -0800)
commitba52b325c43e863fe29e7f83990175c37e379099
tree0ced8b94771b7ae0cf8cfc3ed99b5ff5cb373368
parentf95fe7060895bfe28ea5bdf8de240e01c1dea097
x86-64: Fix the dtv field load for x32 [BZ #31184]

On x32, I got

FAIL: elf/tst-tlsgap

$ gdb elf/tst-tlsgap
...
open tst-tlsgap-mod1.so

Thread 2 "tst-tlsgap" received signal SIGSEGV, Segmentation fault.
[Switching to LWP 2268754]
_dl_tlsdesc_dynamic () at ../sysdeps/x86_64/dl-tlsdesc.S:108
108 movq (%rsi), %rax
(gdb) p/x $rsi
$4 = 0xf7dbf9005655fb18
(gdb)

This is caused by

_dl_tlsdesc_dynamic:
        _CET_ENDBR
        /* Preserve call-clobbered registers that we modify.
           We need two scratch regs anyway.  */
        movq    %rsi, -16(%rsp)
        movq    %fs:DTV_OFFSET, %rsi

Since the dtv field in TCB is a pointer, %fs:DTV_OFFSET is a 32-bit
location, not 64-bit.  Load the dtv field to RSI_LP instead of rsi.
This fixes BZ #31184.

(cherry picked from commit 3502440397bbb840e2f7223734aa5cc2cc0e29b6)
NEWS
sysdeps/x86_64/dl-tlsdesc.S