From nobody Mon Nov 04 13:39:14 2024 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 4XhsyC0QYkz5c5Vm; Mon, 04 Nov 2024 13:39:15 +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 4XhsyB72RDz4PMq; Mon, 4 Nov 2024 13:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730727555; 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=9b2vPs06meaxRHgzjhLitU0svvXGOu7mb8rYLQo1ekQ=; b=iRBxHnQGITlWqMZWs7miVfA9TRytWleqlXvMa9d/8EwbFb1ybH2zoeyI6Ihh/9UUV2CBdP uloR/VO7gANbRAoQbN1lZLtLqYbi91lHduZCfgY3uqS5WpOhaGyNL5ftzOZVIDzuLuwvVk SHh7nILSBHh9L5bnKbakpDwaNLcHKJml3zF8Viv+z6pwxuTUzV/9tJAapfLDRwhzvI/WN+ dGBi//WrGG3opKxHM886/cfljNaH8STNbwDEaDHejsTpfofeTb86fsx4kIDPyKUCI4K+Tq 6DLmGMjuitaIMeeSAZURr9e3IdSUgcCoA4OfWj7+K2AGCJSL+BcG0F/NLl+d8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730727555; 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=9b2vPs06meaxRHgzjhLitU0svvXGOu7mb8rYLQo1ekQ=; b=LlfcZc+xsYxmlq6t1JLaMeh6h5w7Sea8Bp4JwvhwT8xq69ljSBUOjIHbOkZ7BIfqp97Kuc dNqeLdvA0TwfA/ebc2lzdVzd5Va91pIDMD72KnM59pSy82HtuArYvxKYaj880ihtU09Gtr 7XKFKKfwuR7+/drSEPF7LWY1cWTfVenZQfKq9aq6bXR+S/DBQJSHbRL4oI7caX8SNONENA 87A0gkdhvGbvjLZuJwrVk/vJZmW4zfY5dqyS6YU4Z4OPiZxl71RH52oytqXmXtLlQCfO+h egtUlZ5SmdUKIqxmvrj3dvKCkyw7z4z+g0cdlLrFlIDHI1J16hWGbt63NLOVNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730727555; a=rsa-sha256; cv=none; b=s/i/CGpQTDM8Uu6ez/nwBJoZFxaW0asqForTY0PCI2mXnGXw+gu9VmF5VXCuq2jE6481tB ELLTZktMtwdwnXt8sbtE+w3f6XzSQ867mlj/khe5msWSvuFKZMbUO5VV4Hkg9QZzpqC/1I hKEfQf2AmtLPs3x6/fK/gvqZFPxr3V92YyNXKY7ZmKoiA8ocM+qugO1CVBRhyzmSsbA+zD rPHg8pVfRkQx79gMTfWfhNgsNWucupRm2lW7Qosgbzu4KfVEyFSB2q1FvrS91T4yP9YUw/ 9Rh2pqxSZkPWXiubqKypqgvhJm8OKSA8HH/ACalsHshlcLbot8sXqOn5y+nYhQ== 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 4XhsyB6Mngzb9f; Mon, 4 Nov 2024 13:39: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 4A4DdEgh010903; Mon, 4 Nov 2024 13:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4DdEGW010900; Mon, 4 Nov 2024 13:39:14 GMT (envelope-from git) Date: Mon, 4 Nov 2024 13:39:14 GMT Message-Id: <202411041339.4A4DdEGW010900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 169a10853a50 - main - cred: crsetgroups(): Throw away old groups before crextend() 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/main X-Git-Reftype: branch X-Git-Commit: 169a10853a50f9bbb037492e6f2737cce10f6b99 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=169a10853a50f9bbb037492e6f2737cce10f6b99 commit 169a10853a50f9bbb037492e6f2737cce10f6b99 Author: Olivier Certner AuthorDate: 2024-11-03 18:04:02 +0000 Commit: Olivier Certner CommitDate: 2024-11-04 13:38:08 +0000 cred: crsetgroups(): Throw away old groups before crextend() Now that crextend() asserts that groups are not set (rightfully so, since it may change the backing storage without copying the content of the old one), have crsetgroups() throw away the old groups before calling it, as it installs an entirely new set anyway. This allows to reuse unshared credentials by resetting their groups set, as NFS exports actually do. Reported by: cy Tested by: cy Fixes: ea26c0e79752 ("cred: crextend(): Harden, simplify") Pointy hat to: olce While here, as I forgot these credits in commit 77d652b4b472 ("nfs: Fallback to GID_NOGROUP on no groups"): Tested by: cy, David Wolfskill (panics caused by mountd(8)) Tested by: kib (MINIMAL/custom kernel compile breakup) --- sys/kern/kern_prot.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index b522edbf4e69..d29833f944ab 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -2217,16 +2217,14 @@ void crcopy(struct ucred *dest, struct ucred *src) { + /* + * Ideally, 'cr_ngroups' should be moved out of 'struct ucred''s bcopied + * area, but this would break the ABI, so is deferred until there is + * a compelling need to change it. + */ bcopy(&src->cr_startcopy, &dest->cr_startcopy, (unsigned)((caddr_t)&src->cr_endcopy - (caddr_t)&src->cr_startcopy)); - /* - * Avoids an assertion in crsetgroups() -> crextend(). Ideally, - * 'cr_ngroups' should be moved out of 'struct ucred''s bcopied area, - * but this would break the ABI, so is deferred until there is a real - * need to change the ABI. - */ - dest->cr_ngroups = 0; dest->cr_flags = src->cr_flags; crsetgroups(dest, src->cr_ngroups, src->cr_groups); uihold(dest->cr_uidinfo); @@ -2475,6 +2473,13 @@ crsetgroups(struct ucred *cr, int ngrp, const gid_t *groups) if (ngrp > ngroups_max + 1) ngrp = ngroups_max + 1; + /* + * crextend() asserts that groups are not set, as it may allocate a new + * backing storage without copying the content of the old one. Since we + * are going to install a completely new set anyway, signal that we + * consider the old ones thrown away. + */ + cr->cr_ngroups = 0; crextend(cr, ngrp); crsetgroups_internal(cr, ngrp, groups); groups_normalize(&cr->cr_ngroups, cr->cr_groups);