From nobody Tue Apr 15 19:44:32 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 4ZcZNw4T0Jz5th06; Tue, 15 Apr 2025 19:44:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZcZNw2Gcyz3bWs; Tue, 15 Apr 2025 19:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744746272; 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=ur+jTN3U2sk/xTEpK8wRSk2D3s+sZRpuNWSl5A+Myvg=; b=A/15TyZZkJQsBe5aboSBEMLtUXhDFARWzP2vkltBK3lOfAS/py0eh5HYB9QZ6PB3Blg4sI veQg5T1qKErSRzv5xnX3o4vD2rVHlVILTP/aaovkWv1L84DGgWExbVpEM8oKp+JfF9NnJh rdZB5Tfh3optwaodXTJHyOIyGNX7ifOcvxEHlkfoarrbVVnEiJUiFJqySRboTTqTijvtvV MgZWqgxmlnR4bmCDs9rwjU+WkiWCFN4YtWoCTkUc/M9XI+i4hTsUwgpXChd93p7RO30Y64 Ru6dKrn+OEPZWkqrfYdzDSAVbYGGL58Y5XBdyRyfKMql865yXqqL4DSbZdQnog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744746272; a=rsa-sha256; cv=none; b=gjzzuOL65IxEcUXCiqZgC/pkTUnh3wwFKDXemVlqNgS++E/GwGK4v91oOZIBCA8Zn4pCja C12ysAqYfHNTxXMn5z9u0ibEL2YFhWvqJ43N7CxYSLdAtzi91ZUnIxCjc8FxLaHaGzfCDv n6RuNvY1TWZiZSax3mXjhJU7bNyRhDuld8PA7jzdJCccNMjNtpnZMA3rZldxNAHIN+C8Bt YltWrk0OOpN69HeNe/YuDrSNXEhAyuSQsZvTEwYShkjPtyBQoBS6b4g2XwgjDMCqq/z+RH CmedoqQMgUkQfLox4kBn6eEh7KDubCCLCaYwApH7V3o2PTSsUV2JcsKMoO9HYg== 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=1744746272; 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=ur+jTN3U2sk/xTEpK8wRSk2D3s+sZRpuNWSl5A+Myvg=; b=UBLJnBrpfmotryh1e8wyvGXywNFjnJgYEAUN7emLFQbpUcEBbX2+CAA8kFQC2AIoIsYHnX jUtCp8gBvPrjDSnJqTqcO69vGyv8EoqWNDXyDB0yA9DpChfzj+4NKgvK5xiY9TizNvbmz0 u5EWo5x5+A17Q/k0xb9z+ke5BMkqja2/xpsVthEPpYMZG/daJWwUSJWjVjVoSblgq+Q1Pm xKasjBB92yceGmWqU/WDrijxR4JJm2h5l6KwqkvXSkFH1gCDLDiJHStju0tzysOxnUERYu Lwxq4+4ukR4te/cBQlU8OhI+ljN+ld60xKnLkil0YCDYneWL8AawYCPDi3VSgA== 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 4ZcZNw1s5SznbP; Tue, 15 Apr 2025 19:44:32 +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 53FJiWf1063924; Tue, 15 Apr 2025 19:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53FJiWNG063921; Tue, 15 Apr 2025 19:44:32 GMT (envelope-from git) Date: Tue, 15 Apr 2025 19:44:32 GMT Message-Id: <202504151944.53FJiWNG063921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: fca3395674d4 - stable/14 - cred: fix struct credbatch to use long for refcount 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fca3395674d41fded108e493c6b5695bb6dcd077 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fca3395674d41fded108e493c6b5695bb6dcd077 commit fca3395674d41fded108e493c6b5695bb6dcd077 Author: Gleb Smirnoff AuthorDate: 2025-03-29 22:09:15 +0000 Commit: Gleb Smirnoff CommitDate: 2025-04-15 19:40:02 +0000 cred: fix struct credbatch to use long for refcount This structure collects count from multiple cred structures. Of course it can't use a smaller type. PR: 283747 Reviewed by: olce, mjg, markj Differential Revision: https://reviews.freebsd.org/D49562 Fixes: 37337709d3334f32650ba3a7c529fa013ed5e1f2 (cherry picked from commit cd46e980134f6fc765b28ee9c8bf41e8fc1b0261) --- sys/kern/kern_prot.c | 2 +- sys/sys/ucred.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 31652a338e8e..d0f4c8cd6992 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -2365,7 +2365,7 @@ crunuse(struct thread *td) } static void -crunusebatch(struct ucred *cr, int users, int ref) +crunusebatch(struct ucred *cr, u_int users, long ref) { KASSERT(users > 0, ("%s: passed users %d not > 0 ; cred %p", diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index be7d5bab1d19..f43e3bb12414 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -195,8 +195,8 @@ struct proc; struct credbatch { struct ucred *cred; - int users; - int ref; + u_int users; + long ref; }; static inline void