diff options
| author |   H.J. Lu <hjl.tools@gmail.com> | 2023-12-20 16:31:43 -0800 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-01-31 17:23:32 +0100 |
| commit | b02497f154d61780a8ac8a735a5f7057ab8428ee (patch) | |
| tree | 87b8adca2b66fd97d1a09f285269d55ec8c370a4 | |
| parent | elf: Fix TLS modid reuse generation assignment (BZ 29039) (diff) | |
| download | glibc-b02497f154d61780a8ac8a735a5f7057ab8428ee.tar.gz glibc-b02497f154d61780a8ac8a735a5f7057ab8428ee.tar.bz2 glibc-b02497f154d61780a8ac8a735a5f7057ab8428ee.zip | |
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)
(cherry picked from commit 8bd00f5b6d42ee89f61b5f15624788ad1aed917e)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-tlsdesc.S | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -52,6 +52,7 @@ The following bugs are resolved with this release: [30477] libc: [RISCV]: time64 does not work on riscv32 [30515] _dl_find_object incorrectly returns 1 during early startup [30842] Stack read overflow in getaddrinfo in no-aaaa mode (CVE-2023-4527) + [31184] FAIL: elf/tst-tlsgap Version 2.37 diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S index 5593897e29..c4823547d7 100644 --- a/sysdeps/x86_64/dl-tlsdesc.S +++ b/sysdeps/x86_64/dl-tlsdesc.S @@ -102,7 +102,7 @@ _dl_tlsdesc_dynamic: /* Preserve call-clobbered registers that we modify. We need two scratch regs anyway. */ movq %rsi, -16(%rsp) - movq %fs:DTV_OFFSET, %rsi + mov %fs:DTV_OFFSET, %RSI_LP movq %rdi, -8(%rsp) movq TLSDESC_ARG(%rax), %rdi movq (%rsi), %rax |