From nobody Fri Apr 24 15:29:13 2026 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 4g2H1j6DNqz6bSQW for ; Fri, 24 Apr 2026 15:29: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2H1j3D8Cz3DDV for ; Fri, 24 Apr 2026 15:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044553; 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=YaFFLwqrLihYniOvTyg4puIDHIiullGZwEkEOjK7xSk=; b=Tfaj8vJuDOfFXWf4qSA1UdySJJIn4mbHKZwOiGzjhAQjkVorNkGIrkXFHJR0lLphHaoamO 9dzeMDPVgdyeUq9KILwSjpmSjcHz7cP31pjPiJW0tK014GCDEIBuk29ZYy9+oomj39Dnd6 O6WmKB66c6zfBf1oiei35t1sSFiTCtLuKkZ0RU9yEO0RRLwUbCb2NxjhIZer93eJNeIYmr FnQKtxTy7nIHwagx15cBAujHVpBvkYST/Opap3kKKIL8mwI2loqdbhRzpMS22xHb1b0Qgg zm8kdU1h7QEUyxa1+YftIlb37uuGGBk7u6RH7E0tZBLTrw/wxMx1QE7s4F3nqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044553; a=rsa-sha256; cv=none; b=ocBVTBnfUoqwJQryfUxPbFxZHRdSGqV06TlGJYJRR5Hknz4KlkYk0KiQe8RbrZUff5tUd4 UydLYtvYF3omejoifmLSJ5TsMXvrgu9uek3+ex4nQLYGimf65ZtXaWuhBJcphDJ0IJBe9n TC36z4zV1BvgX9FVHpMuFGqyOb1BdUksVhjx09/lEEcYAlUmA2Z/l8b3/QPvot2aL6dZ32 ZEGsaoozllnBhXfqTjlOkZMlqcVAM11cc/0X3oUAqV46aVvkzlGA8bddpxHPmQwuEaN0pX +/rMgh7Df3YkJCSvGakSIhWVZOU61dtB+Jqjd6fRdtY4It5I0DocjiYn7Pr5lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044553; 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=YaFFLwqrLihYniOvTyg4puIDHIiullGZwEkEOjK7xSk=; b=RiDiD5BDzeslfmTZZuBV3pd+GvswRwa4bF2XYBsrQJaJD/LL8ZJdhux1/LLa6q+Huutpkb Ken+o2Rl0+k4KY9dXcDufLalVqZXKljbrNSOrSI02iuwFXyg5fXDVcBHwjJBhd/ltsDJIR AgSOZw444puIcsS0u1nSLJg1KL8j9bWtK/0A19IOWh51x//w2RwXrRj6LUs9zo1Y7qcWza 5KFADIh/oh8H8xzmMg9iTwylErk1n4TPG/AIGBcv6XIyWNou480FdkmHkrDFv9IJChKzNN Q+VNeQYejQm18aruNeeLHxbXrXWj/DXchmN26eLbBHE5nAzevPlJyMFcJmoMNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H1j2rFTz17lv for ; Fri, 24 Apr 2026 15:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35b84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:29:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c62cae9b53fe - stable/15 - rpctls_impl.c: Use a direct cast to uintptr_t instead of __DECONST 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: c62cae9b53fe2c5e52a185d3ed37f55ef383f064 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:29:13 +0000 Message-Id: <69eb8c49.35b84.335571b4@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c62cae9b53fe2c5e52a185d3ed37f55ef383f064 commit c62cae9b53fe2c5e52a185d3ed37f55ef383f064 Author: John Baldwin AuthorDate: 2026-01-21 16:10:53 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:38 +0000 rpctls_impl.c: Use a direct cast to uintptr_t instead of __DECONST This fixes the build on CHERI architectures where the compiler warns about a direct cast between uint64_t and const void * inside of __DECONST. However, GCC would also complain about this on 32-bit kernels due to uint64_t not being the same size as a pointer. Also, a direct cast to uintptr_t to right-size the cookie value is more direct than using __DECONST given that there is no "const" pointer involved in the expression. Reviewed by: brooks, glebius Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54797 (cherry picked from commit 5eb1d4eec67685a933cedd5a20fbec86febcd3a9) --- sys/rpc/rpcsec_tls/rpctls_impl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/rpc/rpcsec_tls/rpctls_impl.c b/sys/rpc/rpcsec_tls/rpctls_impl.c index 51fe270b13d9..22ba699a6fab 100644 --- a/sys/rpc/rpcsec_tls/rpctls_impl.c +++ b/sys/rpc/rpcsec_tls/rpctls_impl.c @@ -163,7 +163,7 @@ sys_rpctls_syscall(struct thread *td, struct rpctls_syscall_args *uap) mtx_lock(&rpctls_lock); upsp = RB_FIND(upsock_t, &upcall_sockets, &(struct upsock){ - .so = __DECONST(struct socket *, uap->socookie) }); + .so = (struct socket *)(uintptr_t)uap->socookie }); if (__predict_true(upsp != NULL)) { RB_REMOVE(upsock_t, &upcall_sockets, upsp); /*