From nobody Wed May 07 19:22:12 2025 X-Original-To: dev-commits-src-main@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 4Zt4s15xG3z5v9MN; Wed, 07 May 2025 19:22:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4s12gYyz49nf; Wed, 07 May 2025 19:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645733; 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=7V72Qe55/AZ9qPU7nK2VlxND4XgpV5WndGQFZEunpaI=; b=PfWWkoRuTmfo6msKAkxRfKP/DWQcuQIHNAmJ6FjTcS0YpMmbW2a1PMQ0ROf7139z6wouQ5 4SVAzL7iCZ8oB9Qj8mATxig8EkC9jXfXnyGuf20w8tAUglNNCU16qJVUEXIC0LdOFEvizH m++ftsytDd6k8lxrQEpukrAmmS0otac+7O4gWRz/xtM91TuJp98jU9MoxJacbucXcCwgf9 5JKYF39Q5KA7pJYh2qHTmoCY4V3Oy4Vh9blAE/z8X3xTipkCl+bgqwjnpMCbsPbF21MSm8 OHibmjq24P6A/NAWAL4m6Ap71d70UqK6lhgBw3ehjsbehYZ9Z7GhdjRGUukZDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645733; 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=7V72Qe55/AZ9qPU7nK2VlxND4XgpV5WndGQFZEunpaI=; b=hcvyYmOCWsPEedLf/SAYXz2HVVXN2hByNAZ5QMBsbv5DfSrOytJXnOISldGHjHz9v9W3X4 084BrCtLAQYwMApjRMpwanf/6Sz6g5New1FiHtIF7wWDMU45jnJbbBx9k7OOFN/JfFTp5t z1CQ3Is2r70323TyzmvkbTLDm+H/cfmWKHcBC7stIXaqZ7uJZdtafM1zrjQRIlWd9AMf5V aH7zzMq7Kan3AGYHZ32Bj9ohgqRroMXsBICFTfAviQe1ttHhwK9VCNCTGfym/lDaj4WTm4 H6YO6gC7CcBBTu61fsxBWUF74HPcS2iWAWO/IPOkTs0Wz4Sh2z5AMQCayi81jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746645733; a=rsa-sha256; cv=none; b=sdAV8YRxc7Wx957b/iRSy/kgLaDqbIWaAig+p78JcJb4G3c1Ohy+ZRVdH7+Jzenr3kd3Gx REioht3wIGsRi4UrdkpfLBQaKTfbXOGxqHuO6oaoClkr+sAC5wQspitfL6/ELWtCtRGGkR 9qEz8EA5eUm1aX27/mgK98xM0XR/dI+NftACGaLNtLXlnXAOqjEp1hafkbDkVNJGlH8B4S XEgQnwYhR3+5SnB5bIPBaVlwHO2b7iqUSQOfYV784SslyoE5Bg16JVXSXlBfMlFeSqDj/D KU0G+TVvYMXBHOWray58570wnP5/LdlM67FhICf4XgK93McxxSEQjMCNEYwftQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zt4s10jKPzjhN; Wed, 07 May 2025 19:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547JMCop043164; Wed, 7 May 2025 19:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547JMCR4043161; Wed, 7 May 2025 19:22:12 GMT (envelope-from git) Date: Wed, 7 May 2025 19:22:12 GMT Message-Id: <202505071922.547JMCR4043161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 0d12f495d8d9 - main - rtld-elf: Use clear pointer provenance when updating DTV pointer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d12f495d8d9442352afa9dfc59a0b078c7b2852 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0d12f495d8d9442352afa9dfc59a0b078c7b2852 commit 0d12f495d8d9442352afa9dfc59a0b078c7b2852 Author: Jessica Clarke AuthorDate: 2025-05-07 19:20:20 +0000 Commit: Jessica Clarke CommitDate: 2025-05-07 19:20:20 +0000 rtld-elf: Use clear pointer provenance when updating DTV pointer On traditional architectures where uintptr_t is just a plain integer, there is no provenance from the order of operations. However, on CHERI there is even for uintptr_t, and in future this code will use actual pointer types anyway, where the provenance does technically matter even for non-CHERI. Commute and associate the operands appropriately to ensure the provenance is for the new allocation, not the old one. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50230 --- libexec/rtld-elf/rtld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 44347e482c64..cd564daa94a6 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5472,8 +5472,8 @@ allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) for (i = 0; i < dtv[1]; i++) { if (dtv[i + 2] >= (uintptr_t)oldtcb && dtv[i + 2] < (uintptr_t)oldtcb + tls_static_space) { - dtv[i + 2] = dtv[i + 2] - (uintptr_t)oldtcb + - (uintptr_t)tcb; + dtv[i + 2] = (uintptr_t)((char *)tcb + + ((char *)dtv[i + 2] - (char *)oldtcb)); } } } else {