From nobody Fri Jun 9 12:14:06 2023 X-Original-To: dev-commits-src-all@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 4Qd0PB5LRSz4bnQt; Fri, 9 Jun 2023 12:14:06 +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 4Qd0PB4Xppz4N8F; Fri, 9 Jun 2023 12:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686312846; 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=5nXsRBLjdtc9W64bWYyeoeRdB2YTe7k0xiTsjBD5Ey4=; b=LrxtXDUA1flbUwdQBMQo3dc6Bst2t1+KRAL8SmrgjU7vAYlJyNEs8umN0arpvxtBzJevhD w80xaed6NrIV0mpIk9jlQEK921mhaD4KVvQqe1Zz3kTz7LvmIrUBoD1SBLHE9Yewl9vZNG 7MgYxLZ7J++qpNWHmqM+VnYp6adRsCXtmlkS0B97ZGPnhrhLgZd+qRzKnWu8XbnH0IPbmZ ChnCC3Yu4TBW76lcfvf2LmShwaMNjKk17MEs9P3UhItI7JuZwalWXBt9rPKek7VgsmjGCY oVWVibNSpt7E5KSk7NlOwTsHJbTl0K/BFxIXCTF+RnWJ//eqm8ak6uBO1+wofQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686312846; 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=5nXsRBLjdtc9W64bWYyeoeRdB2YTe7k0xiTsjBD5Ey4=; b=YobZ3HgMyBYHEfb7MlkpTB1JX/qNBdYHChjLeGtMgJbum5td8L2VqBMeY77qnTu6J7LEJX ucgPvVsTtaLPuJdHiHrDlgb3hhjlPPyBnNsf5yjZw0PPennCNLSWAr5sfCHOcWthWWtKL+ TSWhllw89CbcxPMlnZID18ebB19aijZbDC9fKUjWFfOG8lYHN73jXSSWKr3KZgd6mnJ/hl OnNX8Tgn61DXMqnOOue2A50KXJ32Hk9TwvoDoy2VsQJHS/yEnXxxPLBgltbwBKa9C7jPdV baZFcGS/xOxlDkaw42sO79mg2sG0nzhn9L5qQ5hOMqd1nHsF/g3DYdHCgu0p0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686312846; a=rsa-sha256; cv=none; b=QRsTY4mrsP3na4JScSJSBtCRbQqYKQG1tjxaQX75Rh/OUuOyZXZVjfU8SocdEm6GT8Ys0T jg0g2wgfmWiUHq0Q07Zlin9lSxpQ3pgnUqfG9w8aCRwD/cp7vWtgF4FmG1X4hgb7m9pOJU 2hZSh0Hvad9uQvezOkxVxbIrlWanl3bglJfPJD5+v4Xjbt5FblFKwCjmRCf2fYVgDzwi3r SR7pHQAqpnD9UaK/tjS1MN8zqGk4CtorzYTAa1mJ96F9n1x5Ljqt6KCQDfY2nlyyl88smp mZHrD6VH5NxYHtIH2rvtrhGb4EMdhYoJ/FWjVssooc0Drq0XNz6z4QXaASeDBg== 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 4Qd0PB3cjSzbHt; Fri, 9 Jun 2023 12:14:06 +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 359CE69E012708; Fri, 9 Jun 2023 12:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359CE62w012707; Fri, 9 Jun 2023 12:14:06 GMT (envelope-from git) Date: Fri, 9 Jun 2023 12:14:06 GMT Message-Id: <202306091214.359CE62w012707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e9a38ed2fa61 - main - rtld: fix allocate_module_tls() variant I fallback to static allocation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e9a38ed2fa61fd264a80f24ceb35f39b0ac6463d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a38ed2fa61fd264a80f24ceb35f39b0ac6463d commit e9a38ed2fa61fd264a80f24ceb35f39b0ac6463d Author: Konstantin Belousov AuthorDate: 2023-06-09 00:51:32 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-09 12:13:46 +0000 rtld: fix allocate_module_tls() variant I fallback to static allocation Submitted by: Joerg Sonnenberger Fixes: 91880e07f605edb90339685bc934699a4344de3bESC MFC after: 1 week --- 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 72a128ccbb81..173dcd4e9878 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5465,7 +5465,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