From nobody Sun Jun 11 23:40:22 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 4QfWX72q7qz4cLKt; Sun, 11 Jun 2023 23:40:23 +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 4QfWX71TDYz43c4; Sun, 11 Jun 2023 23:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686526823; 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=93Mmxu/pcmd5M5vlNUm5O6AOOvdWcYVp1gHAeYUjz1w=; b=V/DVHbNo3Id/TRj1hy0Gsh4Kbr0qakE9EQBY/ALCFOVFbnt0xJ+ya17Q7q3YNKpLXsvQlJ CwUJot8p2ndEHY+TkPV4b9pqCM0aN9oO0NfK0iq9NO8fi8jMx3a1YLzmrvbxJEVvFsT9eR 33aQRdgnlP/S6z9fxa24JWyfq4JsS9c6TXa33htwNuEE0YYJIDdsEkFi5JMmjc0bshJ2M4 MVJWKWiAtkofWTdzgyywMLr09syjelYVrl69C0S2mJEL2XkKw15tIhcKH+C54lp+gAn3nV /A9FSDW1qroGruj60ebFTXwQU2oGA96lbnNtLKsfbkYi8swLOFPYQN4w9B/t2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686526823; 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=93Mmxu/pcmd5M5vlNUm5O6AOOvdWcYVp1gHAeYUjz1w=; b=aat7Vi1AtCynZifrBrolS+6pYjbA203qOKQRpxbFxcmH7opvqrFjugqN8pTPOHTEEKVMKw JQD/6R5SamsHCxOqSnGXmFFz2wnbjS+m6DBHki/i0KUW8XyDMGxNWjYvfqB/PI1VE+n/5E PCdb1sJp6A3sJftlrHXLNXyDyTVloCsXE77tK7kjfeY9uGOe2ojN2m4yZ41nl7BSPT9KWj dGsKCVtAl84vZ+AZyBcvCrSbyRAFk7KdbdWskQljSmIlTucQ/8ufmKshImzmBBivLdJctb MfPf6jcx9NG7lPW6E9pFWnmdPprCEGKk8435hRlUV4zQK0yK93akzYiJEQlUoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686526823; a=rsa-sha256; cv=none; b=l8aLmc5KqseinsbR3cefLSK4EvWDr9gEt+/HCh+XeF+1Op+t1sWoZaGgWBENb5swe0EOjA szP7p0kNaMw9gog55/r144oxLRVnyZ6j0XuomSyL9siBsYL+AUsROLuKNTkJ3k6vQukbVt HUcbddyXA+hL9oUFZ1C7QRDNUqFdmS2SviUDA+ve8iE08JLbu+qNys+F8soKudI2/gX0GW cLknYEdLSEjvmMZajF8vnQSg/AI8Y8a7yfBVoq/ipLyC8iSE8D6lttKCTNuWQxxKL4436D QdeBuQQiontfId719FxDONDzvpuIKjB9tphpESGNPqxhoxsn9FC/cj5FiTaF8A== 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 4QfWX70bHwzJBQ; Sun, 11 Jun 2023 23:40:23 +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 35BNeM4q087856; Sun, 11 Jun 2023 23:40:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35BNeMq0087855; Sun, 11 Jun 2023 23:40:22 GMT (envelope-from git) Date: Sun, 11 Jun 2023 23:40:22 GMT Message-Id: <202306112340.35BNeMq0087855@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: 62bc41c614ec - stable/13 - rtld: fix allocate_module_tls() variant I fallback to static allocation 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: 62bc41c614ece3fa32010a92cb57738303795666 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=62bc41c614ece3fa32010a92cb57738303795666 commit 62bc41c614ece3fa32010a92cb57738303795666 Author: Konstantin Belousov AuthorDate: 2023-06-09 00:51:32 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-11 23:39:43 +0000 rtld: fix allocate_module_tls() variant I fallback to static allocation (cherry picked from commit e9a38ed2fa61fd264a80f24ceb35f39b0ac6463d) --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 017833164a18..91b09b5fbd25 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5511,7 +5511,7 @@ allocate_module_tls(int index) if (obj->tls_static) { #ifdef TLS_VARIANT_I - p = (char *)_tcb_get() + obj->tlsoffset; + p = (char *)_tcb_get() + obj->tlsoffset + TLS_TCB_SIZE; #else p = (char *)_tcb_get() - obj->tlsoffset; #endif