From nobody Fri Apr 29 20:55:10 2022 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 764011994DD2; Fri, 29 Apr 2022 20:55:11 +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 4Kql9p55kTz3F6D; Fri, 29 Apr 2022 20:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265711; 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=jFht7Tij1Qa66orFLviJewyCBKJxfYNm+Ff34WNhoj0=; b=eiLLDLvC3/Vbzw66h0uC4RP13PdZBgiFSSFXHB2teBiGaVWnXnAxMOrR4RzAvaCCsGjtMH /0VBLUPvBUmqiIbf4KPNozMIAK31jQNlVU1rvH2+0wrjEeTDFuNBEPSVKVj3ZVQq1vlAmf HcUy4lJqujoOA8xsyO3k42Teq/VsW/L51J9P7GW85tneG1qyx+w8WqiaJXVRDFQVqbQs1J dt8srQBpWGc+jC9sLRFemvWrTAjkQ9JDGJzrCOCXuUjSnSoJ285eZxnzhGSBpOPTrvAjxA bk7J4v1mN8Snu5ZJbQoH0cwI82mVMdvMsczXg6Zb5d9wUB9IeCdsPpttGvDpHg== 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 3001114400; Fri, 29 Apr 2022 20:55:10 +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 23TKtAN5055290; Fri, 29 Apr 2022 20:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TKtAq1055289; Fri, 29 Apr 2022 20:55:10 GMT (envelope-from git) Date: Fri, 29 Apr 2022 20:55:10 GMT Message-Id: <202204292055.23TKtAq1055289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b602867013cf - stable/13 - mips: Add TLS_DTV_OFFSET to the result of tls_get_addr_common. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b602867013cfb41b2b884f0fc50748c4f12608d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265711; 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=jFht7Tij1Qa66orFLviJewyCBKJxfYNm+Ff34WNhoj0=; b=wA5vei/qyiFDJVRCRBSQp6lEOOHGLhLIY9DrkUK6bNJcPHsURbNNipeo64f+IFpjlgvYFZ D+7XKGnmSOG3c1skMrh7j1o1EfJIs6IAU+8NuGXF3MjZu/Sxx05A5OqgAEU6i+SVmR3Zxw dONyFbCNk8Ou4Yvqx2Nxwwcaz1t9QqBCUKhUmxqEr3xOS2VNvULPZbvpu9jqwFA1B4Lco5 axmNKzJkyeCtfkeOjmQmj43Ocx0eoeVNrYtdIEicvCd4d0ETDeRE7fjDFK4TWvRAZ8RAsG zoK0ElcoiCeFoe0Kc/2F3oNWz7O/a/PVTp8UTQCOLiY4KxMy1RAWN+HFHd/lAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651265711; a=rsa-sha256; cv=none; b=V4zc+MptV/eKBggPSEH17B254q/5ENe4KI+Gi8IZlkv+9QnKE6I7ajRy6FWUnI0SONWTMV mw56GJARd3GMJlMT9HIy5MJqlxQwDczOph59nexyap8q+QnZ2OjZuYdfYnSlftPV3XtiPf AcyzgsWWFNYPwBBEIaSJgeIIkzNANXVrKPLZI6+wsG+vRbb4qmWEyCg+/Ve7unaYhrZP26 6ZyCMuUOq3U1SzZ8wz6OrADAf8k/vsPl4Qk2YoW8wHGzMZ/dfodjGVsU4pZvzsCK4AgRLK HBgP763vwc+ii9dgH+VcnNePkljkF+27haUGkrLxdBsP1AP6VQIsFaOk1ate1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b602867013cfb41b2b884f0fc50748c4f12608d4 commit b602867013cfb41b2b884f0fc50748c4f12608d4 Author: John Baldwin AuthorDate: 2021-12-09 21:16:19 +0000 Commit: John Baldwin CommitDate: 2022-04-29 20:50:05 +0000 mips: Add TLS_DTV_OFFSET to the result of tls_get_addr_common. Previously TLS_DTV_OFFSET was added to the offset passed to tls_get_addr_common; however, this approach matches powerpc and RISC-V and better matches the intention. Reviewed by: kib, jrtc27 Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33347 (cherry picked from commit 23e0c0e9a3e0c73169c2aa90e26bb5cb35f1aa2f) --- libexec/rtld-elf/mips/reloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/mips/reloc.c b/libexec/rtld-elf/mips/reloc.c index d870b8a1952c..a39a96e20b00 100644 --- a/libexec/rtld-elf/mips/reloc.c +++ b/libexec/rtld-elf/mips/reloc.c @@ -783,8 +783,7 @@ __tls_get_addr(tls_index* ti) char *p; tls = _get_tp(); - p = tls_get_addr_common(tls, ti->ti_module, ti->ti_offset + - TLS_DTV_OFFSET); + p = tls_get_addr_common(tls, ti->ti_module, ti->ti_offset); - return (p); + return (p + TLS_DTV_OFFSET); }