From nobody Fri Jan 17 13:36:14 2025 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 4YZLNZ4DSZz5kxv7; Fri, 17 Jan 2025 13:36:14 +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 4YZLNZ3h7kz3lNw; Fri, 17 Jan 2025 13:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737120974; 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=cfRgtDSEOeEYC4xDsfQxsIVr1hdCKw32iPFZAJXucUc=; b=PMJ1iQr7RTQmwFD0rjS8yRHViLEsZLgoEvd2cC1r7mGt1cfQjKQf1QaiHUGYhg9PQ4G5Nt rZKS57PwVU6AaFlICgT9C0267JUtz8LfBCOyutfcVNM+tR3x+w894qiFcFnuSVfw+F2Bll 5vI2lsYDkEKUmxNDagrE/dhwy2v4c+Wn7Pyvz64y83Bq/bLmNSAf3zsQH8StoWQ4zB28Ea m5dD84iTJVo6hB5orQVav+bCbwsnLk2WquwsSGdn+1Rj+429ygPLXa5rHBgFkYwxQLecXQ OLqACkEu8hEkeBfosGcP1OnLqxnA5wk0S4ZbYxHRDY12K3Akx8mVOnuq4kl+jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737120974; 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=cfRgtDSEOeEYC4xDsfQxsIVr1hdCKw32iPFZAJXucUc=; b=C3jJT/ya1R8qJ/qMSBEfipRmhT8JgNoRjwPi8FAxxK97e4janlYY53EuW04CqIRLeHW2lR R/gukid4EpJrnJ8WiocA82wUKhy0kCKjYO44ZVDVo/lFfmB6nKb8Lbli9jvQ49COxyJJMK VLzW0MP3Q1jaZO8+yt8lnEsexwCeNWoF+nElRIpwMuqua6mmSYOGViTEUt4BBQxTtjDSK7 0orTnrUac/77WkYiImdC4BAEFJ21dZ2EwTfLVHn+LUvnIQGSyMj2ei5cFQGe+ZuMJpZymz +7EFL0mPGvNDScvDlCX3g2UWxBINwkrlbVUk9ADxiQCOo9FYTSEGEQF/GA2Q5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737120974; a=rsa-sha256; cv=none; b=CPvCMpv/Fu87HkShFvttDoDt9Eqdzbugon7Qd5XJMmInC9odQ8X5dWIskSstqSD+xCWn/1 JXjja2qqMNnTEWEAXb85DgqlLnCLRrYjUwkdYVUqC55CmhYfNKn0DrVSs48zDaHbB7vMsd E57qV/In2CSurCH3NFwEQWVE7ax1ZF+ht9RWcxhv2rAkZZF/7G4q5mK0iBUnuMcd9Tc5Oh cQu4UeAI3h1rgBF94YpqO8Ds2mQGFYMzkYAOh6PFKlxeO2R7aMUr34rYa4CIGYTDPcCrt3 nFbagL9dflBE6MzQJz6sgEZPXNKRH60cw3I7Xzsl6xlfZNsnP6pnZeL59ajw+A== 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 4YZLNZ3H1tz4dr; Fri, 17 Jan 2025 13:36:14 +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 50HDaES6086087; Fri, 17 Jan 2025 13:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HDaEE9086084; Fri, 17 Jan 2025 13:36:14 GMT (envelope-from git) Date: Fri, 17 Jan 2025 13:36:14 GMT Message-Id: <202501171336.50HDaEE9086084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 0e17cf062975 - stable/13 - cred: proc_set_cred(): Fix debug build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e17cf06297555a34485111360caf06c213179af Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0e17cf06297555a34485111360caf06c213179af commit 0e17cf06297555a34485111360caf06c213179af Author: Olivier Certner AuthorDate: 2025-01-17 13:33:42 +0000 Commit: Olivier Certner CommitDate: 2025-01-17 13:35:38 +0000 cred: proc_set_cred(): Fix debug build On stable/13, the 'cr_ref' field of 'struct ucred' is of type 'u_int', contrary to stable/14 and main where it is of type 'long'. This is a direct commit to stable/13. Reported by: Jenkins Fixes: b3d437832ffa ("cred: proc_set_cred(), proc_unset_cred(): Update user's process count") --- sys/kern/kern_prot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 4ab68aa826c9..95e843eb99f8 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -2298,7 +2298,7 @@ _proc_set_cred(struct proc *p, struct ucred *newcred, bool enforce_proc_lim) PROC_LOCK_ASSERT(p, MA_OWNED); KASSERT(newcred->cr_users == 0, ("%s: users %d not 0 on cred %p", __func__, newcred->cr_users, newcred)); - KASSERT(newcred->cr_ref == 1, ("%s: ref %ld not 1 on cred %p", + KASSERT(newcred->cr_ref == 1, ("%s: ref %d not 1 on cred %p", __func__, newcred->cr_ref, newcred)); if (newcred->cr_ruidinfo != oldcred->cr_ruidinfo) {