From nobody Wed May 7 21:20:53 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 4Zt7Tx5jSXz5vJ3V; Wed, 07 May 2025 21:20:53 +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 4Zt7Tx5FTDz3VJH; Wed, 07 May 2025 21:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652853; 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=nqSdyDq0LJKE2a5vQLJluUhNWHK/MwExbxnXqgbznuc=; b=gG6yDJaRvfvj+iRsW/+bgGn5K3oSRzee1zTenn4th6HQ+FtN6v4XaoM5iULWmFD7Py8J1F jf7ni4hGVvYV0L+Nw4rtgMG5b8NrXSYknef6hgO5ts2yguenNqeEHe75Li0XahRPlKQSGt v1fmtfOFFVqaSWWLCygneJ+4K9kIRheVX2rROyZQheJ9qOPBMx7fN+c5taiStEiUpPEvzm 8qz17rxqqTj0L2Pt4QjqHxj+8suty5guR+bCJG2Eb/2Wp6PQxDVCx0xdKVUN8J8o0DJT4x M/Tst20s36QwiscfKdQWG42Iq3fr+t53Du1oyalO/xp7bKcMcAKx1cJ0dqyUQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652853; 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=nqSdyDq0LJKE2a5vQLJluUhNWHK/MwExbxnXqgbznuc=; b=g7XvBWHiHPDu3ksos0TQVLyG+xJcnS+KArAa9xg0hGxuU8dvETyYx0Y9xepKN4LeNcZCbh Q1vGgqEF8YQPZR2XGf6zLfIWnBr/FKbfad2Nj6NGimqCT9QS0gbUWnwVNDht/7Ug0yu+CJ n5rXFoxPWC5KB9NICX6Oma4y2oE2Ur2ncOwk4S3ah8NDuce8nbPAnaz0EzufCCpiL17t16 6wOkhML5+G7/ojqV2H1D1mvAyRqrWvh+/azpyThAw3tGvxKlCxKLCq2t/PMQUpssJ2F5dk 7gncrBLKdOdskRwei0fCMs8ml6jGj8fmHtaLzS1mUpwAfAxIEAv4hSAFWzPXpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746652853; a=rsa-sha256; cv=none; b=Kx70zFzfpqKilccs3WEqAFS1aX2H9VphUaqFVIccboM3YWRUMMI2UsO/zd1/6ISg+gAMx4 YHblVN6SY10sud2vn4DJyvfKNv4StsHK+ThZkIFxJaeyWdb1vDB/SlrSwIW6+8uolFhu7B 2TAUQSVaa9SsiHaGBc6ZQAceOUAnusp/NkBH0p/XNVHg1ViheO+KHtAr5q/JZmD2sM8/tx trgGvAlCin9BbKEzi3/sWJaCWRxfRf8XApT8CJh2Wt9LLreHLs2YNFhTNUX0aMrxTm9xbL nXKM7UcTz8RlJiYfviPfbzAcalAKLwUrw4l1vdk8RqNUYOWpkHeTDFASBe0PVg== 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 4Zt7Tx4kdJzmKY; Wed, 07 May 2025 21:20:53 +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 547LKrsq064710; Wed, 7 May 2025 21:20:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LKrrP064707; Wed, 7 May 2025 21:20:53 GMT (envelope-from git) Date: Wed, 7 May 2025 21:20:53 GMT Message-Id: <202505072120.547LKrrP064707@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: b640600834e7 - main - rtld-elf: Use size_t rather than uintptr_t for an index 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: b640600834e73178056caa9a07f981b707eb40e7 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b640600834e73178056caa9a07f981b707eb40e7 commit b640600834e73178056caa9a07f981b707eb40e7 Author: Jessica Clarke AuthorDate: 2025-05-07 21:20:48 +0000 Commit: Jessica Clarke CommitDate: 2025-05-07 21:20:48 +0000 rtld-elf: Use size_t rather than uintptr_t for an index This was previously an Elf_Addr and was turned into a uintptr_t when really it should have been made a size_t. Even on CHERI both actually work in this case, but it's better style (and more consistent with elsewhere in the file) to use size_t instead. Fixes: 4642b638a522 ("rtld-elf: Consistently use uintptr_t for TLS implementation") --- 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 3a6863abfe0d..03b4cd2bdda4 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5443,7 +5443,7 @@ allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) struct dtv *dtv; struct tcb *tcb; char *addr; - uintptr_t i; + size_t i; size_t extra_size, maxalign, post_size, pre_size, tls_block_size; size_t tls_init_align, tls_init_offset;