From nobody Sun Jun 11 23:40:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QfWX633Y8z4cLPl; Sun, 11 Jun 2023 23:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QfWX60vFxz43Wy; Sun, 11 Jun 2023 23:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686526822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EAcHsXV8sxLCqlGvUF1PRptGm5rXW1+T9zerxrFuFbg=; b=YSnqWA2jfi/w76+YzUtZjYa0+W/D36F1pJ5kQAD9fa14JM2i4V+vbSPuq5QRAVaH1KQkvb tLDYS95dNgpsMpP1gM31gNpPujJQtY4AupIZHQp9jtdn9+h1VxSMvqMCS4SCbqnRtPn8Kp hcIXMgPPs1a6h+PwlEsYwBu/y2Z3vN+wvO1AuyRP2pohViwWbSj8/t/52i+hMF9/tif68o cCLwZNctifnp1+y+blCbMmJ0t3GzbWfUbxDmsWKYMXK0baPkFOoD/uUbZQo5/NyM2NVALs PnT8yDOTS3YApXbrXBc1I/6igOpM7aB1+HYy95LAG3G5DSHPkPnN9YhqSaHiXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686526822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EAcHsXV8sxLCqlGvUF1PRptGm5rXW1+T9zerxrFuFbg=; b=G1isQOJnwVdaOkAMzOi+SfmrdaTfSwY7Ty230WSeJ//6NM9JkCPlMOExIKIAD6UJ/HtRT5 7uLOdkBQNU0MaXg4EjU1gpSGH/pvShZGf2Gc+ldiRjuA4W1/vui/ZQ2MWSZssF3z6Of5LQ F1XCnTecEVjYqpeRC4BArVNdK7DbJRLl7zJh0dgC44H0kUQIawWtlfEV6GRtbxqP1WyLxB RTyb0/Z7TpNiwMGW2B+96EqJMmL8CKe/mRxkuUBLGd2TMbxHcPef1sKghqD55AvMQsBDpo ek88XNQOC5m8YcAP3gWWhqmIrGPaRLeg1a75WVr343L8cVo6Rg5IZJJcFwAsgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686526822; a=rsa-sha256; cv=none; b=ohlmDyG/6jHItGda8NUQERkRTeoflGNq2GPPjTBmbZ9ZGygdvNdl5/14Z4WGlwS5EXZh8T CzcxX7QQKwIiadY+HfIluH7uVdN3TlHQNQQWAQxAAvMR85mElkKszqbD1esJqrF4sdBdq+ BHSW4vW0EoDQcKwQlD4y772EkaQcBXA0zJpVCEgYHsBarIiBa776GDfjnMMN0E0nEwXPp4 sYgoYdaeH45VLynSlTQ726AXaNtYz1PtN8STJIaxLzWQwxCLoZqoccNqIQlpn8YwxeUwud +Zl/EH5tsg9nj48IieaBcKkH/DaxEuks0uUcPrsYYDcn5cLTEn1TpXQlZCQQRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QfWX56nsczJ30; Sun, 11 Jun 2023 23:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35BNeLUQ087835; Sun, 11 Jun 2023 23:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35BNeLvt087834; Sun, 11 Jun 2023 23:40:21 GMT (envelope-from git) Date: Sun, 11 Jun 2023 23:40:21 GMT Message-Id: <202306112340.35BNeLvt087834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: dc56749b2074 - stable/13 - rtld: do not allow both dynamic DTV index and static TLS offset List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dc56749b2074b4f3e95e7295ac60f04e611949e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dc56749b2074b4f3e95e7295ac60f04e611949e3 commit dc56749b2074b4f3e95e7295ac60f04e611949e3 Author: Konstantin Belousov AuthorDate: 2023-06-05 00:54:46 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-11 23:39:43 +0000 rtld: do not allow both dynamic DTV index and static TLS offset (cherry picked from commit 91880e07f605edb90339685bc934699a4344de3b) --- libexec/rtld-elf/rtld.c | 14 ++++++++++++++ libexec/rtld-elf/rtld.h | 1 + 2 files changed, 15 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 8aa717021c97..017833164a18 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5509,6 +5509,17 @@ allocate_module_tls(int index) rtld_die(); } + if (obj->tls_static) { +#ifdef TLS_VARIANT_I + p = (char *)_tcb_get() + obj->tlsoffset; +#else + p = (char *)_tcb_get() - obj->tlsoffset; +#endif + return (p); + } + + obj->tls_dynamic = true; + p = malloc_aligned(obj->tlssize, obj->tlsalign, obj->tlspoffset); memcpy(p, obj->tlsinit, obj->tlsinitsize); memset(p + obj->tlsinitsize, 0, obj->tlssize - obj->tlsinitsize); @@ -5520,6 +5531,9 @@ allocate_tls_offset(Obj_Entry *obj) { size_t off; + if (obj->tls_dynamic) + return (false); + if (obj->tls_static) return (true); diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 7db3f00e0dc5..9bc75dc97546 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -252,6 +252,7 @@ typedef struct Struct_Obj_Entry { bool jmpslots_done : 1; /* Already have relocated the jump slots */ bool init_done : 1; /* Already have added object to init list */ bool tls_static : 1; /* Already allocated offset for static TLS */ + bool tls_dynamic : 1; /* A non-static DTV entry has been allocated */ bool phdr_alloc : 1; /* Phdr is allocated and needs to be freed. */ bool z_origin : 1; /* Process rpath and soname tokens */ bool z_nodelete : 1; /* Do not unload the object and dependencies */