From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1039) id 0A5833858D3C; Sat, 23 Dec 2023 17:35:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0A5833858D3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1703352916; bh=3WueX6qd6FHX7pWs6inefkjG32tC8hQl+GfM4AwNfHg=; h=From:To:Subject:Date:From; b=sH13r7Z/5sxa8dNNlPIXchhJTvJJ53/e2qiaFTtN5deWafjyzMC5DJQVTx35JhHYb /Yje+LxiJmyn46sTnZs4zpvn62dAMIBKeTxWgZzR9Qo0UvzAJDPKiS/svtKkuGeLO3 X8S2KhLnylFhRFnMguMPs/e/BMPtMr/K86ZhF/Ik= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: H.J. Lu To: glibc-cvs@sourceware.org Subject: [glibc/release/2.36/master] x86-64: Fix the dtv field load for x32 [BZ #31184] X-Act-Checkin: glibc X-Git-Author: H.J. Lu X-Git-Refname: refs/heads/release/2.36/master X-Git-Oldrev: 882a991620fcf2ecb3f623e2d29ac551b33bd6ee X-Git-Newrev: 6a1168279d770ee9631d8d0409768ac67c96be3c Message-Id: <20231223173516.0A5833858D3C@sourceware.org> Date: Sat, 23 Dec 2023 17:35:15 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6a1168279d770ee9631d8d0409768ac67c96be3c commit 6a1168279d770ee9631d8d0409768ac67c96be3c Author: H.J. Lu Date: Wed Dec 20 16:31:43 2023 -0800 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) Diff: --- NEWS | 1 + sysdeps/x86_64/dl-tlsdesc.S | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index ed72d2f2e6..377660ece0 100644 --- a/NEWS +++ b/NEWS @@ -87,6 +87,7 @@ The following bugs are resolved with this release: [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with -D_FILE_OFFSET_BITS=64 [30842] Stack read overflow in getaddrinfo in no-aaaa mode (CVE-2023-4527) + [31184] FAIL: elf/tst-tlsgap Version 2.36 diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S index 0db2cb4152..706856e095 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