From nobody Tue Aug 26 22:49:36 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 4cBNC429ZQz65GR0; Tue, 26 Aug 2025 22:49:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBNC41dS6z3TYc; Tue, 26 Aug 2025 22:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756248576; 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=Xl70/jogFUS46wuRbuLRZhkncv2t2qOhiyQZNrHKl/U=; b=m7KFShahziwv9E0hSdH8TVIC2CWH3J0JyWD78CinuyX5K5IwYekETAUTuIdDooF9EBFDFR mfIf40g1EK9yBfE5VZPGiSPHYCf9q46agProwPhsfpHvrJId59ZQRcWPzPNjgridfR1Tk9 1M1g6Db1syP/lwYIdgwcN61T47b/XXmgdEady27wgNFGwXAWqLcWaGlRhUBnDwxc4bpy1j SdrWRu1WFgLiI8fN6xqizyqEDVN2KlPYAkFp+wXSLj1jBYHRibJFmmMm9SnfqEreMu57Xd lEWYcteQb17XPDDuF9Kjv/Slf4er/Fi7ib2Yze7P/p7HN90k44NSDzCbvwg0xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756248576; 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=Xl70/jogFUS46wuRbuLRZhkncv2t2qOhiyQZNrHKl/U=; b=E9CnD2hrQp/DxVSkNmjV2oZtwQITgKGgzifllM68GAJFZ773IMnlCLCeqTraCvWCB+JTlr Qv4Mgb3e5Y2USNzdWYdZ8rF84y++fitDuKab+a09dPhawFKqJPnRmCBVNyXHfDgXgKbtrN yhoInGcS7NQk7aIQ27LMO0JaKKPC/g3Kxn5dwH85M++3RbopODDVvnYEJfInY23wIvsXOt tRs8B9/ptRRJEV2bQHGmVtDLcdT5EG41iTg+4E8uTWzKpin3iilpdc0LX32MEiOyMEEZhJ 8d0A8m2K01ujIYBUx2xfsCrWFHnTAXgexKaqx31wO6qH1+i7zGpjqPCRFD+B6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756248576; a=rsa-sha256; cv=none; b=qMHHi5ElcaWDBm26JTTcvXDN5IdYZgDzlieK2Dx/fe2YTqLHV608vMS136rN8tt67I8RjL Zv0ynAtyPXJlLw+ejN3BzTfw4YW1q3BZD37ch/k1FmeJkajmH/S3PqdnwP5DvmZo1VcSgH rYaEMUlpDpHK4ZS+2rEhCYdDc1NDipgYwhgTOSI0OSiBzUYTGQ8tL4/fSj1mMONTvYrn4C 9Dbafc7v+rS0/todFgNz8Vh/XaqRHT2PHbMO2NH2rV0NvpKB/zv4K9mRwSNu4fRws/98Xb +xKkolA3XhMM+1u4M3sQrOmesRCxiKIoTOmngliGSwS6WrE1vY6ZJhwIOiGlGw== 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 4cBNC41DPdzwkF; Tue, 26 Aug 2025 22:49:36 +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 57QMnaeP003172; Tue, 26 Aug 2025 22:49:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57QMna6L003169; Tue, 26 Aug 2025 22:49:36 GMT (envelope-from git) Date: Tue, 26 Aug 2025 22:49:36 GMT Message-Id: <202508262249.57QMna6L003169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 0d843cc2e2a3 - main - hastd: update assertion for new setgroups/getgroups behavior 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d843cc2e2a373f01f90453712c62b6bdcb12298 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0d843cc2e2a373f01f90453712c62b6bdcb12298 commit 0d843cc2e2a373f01f90453712c62b6bdcb12298 Author: Kyle Evans AuthorDate: 2025-08-26 22:49:25 +0000 Commit: Kyle Evans CommitDate: 2025-08-26 22:49:25 +0000 hastd: update assertion for new setgroups/getgroups behavior We had fixed some of the assertions here, but I had overlooked one more that doesn't make any sense. We could coalesce these two at the end, but I guess it's good to be sure that getgroups(2) doesn't have some bug where we'll feed userspace a GID if it makes room for it. Reported by: S. Ross Gohlke Fixes: 9da2fe96ff ("kern: fix setgroups(2) and getgroups(2) [...]") --- sbin/hastd/subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index 284fb0d07647..add1280e960b 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -284,7 +284,7 @@ drop_privs(const struct hast_resource *res) PJDLOG_VERIFY(rgid == pw->pw_gid); PJDLOG_VERIFY(egid == pw->pw_gid); PJDLOG_VERIFY(sgid == pw->pw_gid); - PJDLOG_VERIFY(getgroups(0, NULL) == 1); + PJDLOG_VERIFY(getgroups(0, NULL) == 0); PJDLOG_VERIFY(getgroups(1, gidset) == 0); pjdlog_debug(1,