From nobody Fri Jan 17 12:27:09 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 4YZJrt3pVFz5kvr0; Fri, 17 Jan 2025 12:27:10 +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 4YZJrs2WF4z3TdR; Fri, 17 Jan 2025 12:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737116829; 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=Mo2Rw8zj0iIBbIhYarPukP/9DS8IZp4NAydr2HojLyA=; b=iq4LnWACqjDTseo7qLa8O9eg29kGnaruiQrbJQe0H00PymtLtqESSkzFIAv+69hgYdJO51 vaaDLsTfaN+pWQQFyoNvEgGxveheo8AQSauGyGZulQMTWf/zFzKAJpa480aHMKcQqDi7jV e2OBzPi6P/elee5xKTD8vh8wOkOWPypKSnlj8BgA3A2ZeVYZyRRnOdaJiJD4WkpyRmC2wE XmoL/V1BiD1vX63LAexthkayZdiXQUdyDeoJMM9z9j/WnPfxGM789AOnma/xzg3Wp4nA96 Hb5GclQKZI3P69K0wogfE+1LNY0NSCkRMB8dhL38xKjtXDSBXBxM92+93hlbRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737116829; 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=Mo2Rw8zj0iIBbIhYarPukP/9DS8IZp4NAydr2HojLyA=; b=YcHyOFbrnksPpj7ePQ8nfFdC6YQ6BCKjiRNerYibFj7Lb+JIRhkiNfov+HivunpMAEsvoH bGcWG/oOOz+emgMa5BjSbzSeBCku8xoRhwDUNxH8Ypb8Y2IESEP/Nka36y22oHOw9QjN0M kevjCnhYu8j0YSAL86PEzclFxLdg3X1EVjWtkKJBccnw3BpYLrx7Jhb4TZmDv//g8MLwU+ U+NB2wZdl3IXvTBSAfqNoK/o3RsYH3zLroS+lOhPYs3oHej9qHKw5QtAckjEDcLgwgUx2V CHYS/4KFzx5zqb1PhFWPnrSOxKdWDu8oQjKoWcygt6VC0JX2PAxXRDUnaBmt7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737116829; a=rsa-sha256; cv=none; b=lnoKuYB/dUNC1Nn+4Sy7c/U0v5Lo//GzeITjXkt3JRm9yvKn+6UDeudMbqry1WeXK21vpL rkhUqRaS1rbNubBv0GlKZOZWg2HbUKPRev3eQAWD5VBA9h21EjzyK7+io3HDpdotGy6lYc D1oVGsjTB/2M0bZF8SvBH/1iplCmvLpe8S5mS7taVT/5F3MqqsLR1fIt69Ic1XNbrJn/jy OabQSyEJFfcR41UoMCRvYWRmNUUjtuBR2RfYIRLTQIH69nyfPkrRfnFqzDhyZV49HU2Z62 1ZuUyPCBKgyjjyB27OeI/q+5OR47BQwz+fzfHklyViNGqdva1lgSge+1CBxrRQ== 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 4YZJrs24P1z2p4; Fri, 17 Jan 2025 12:27:09 +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 50HCR96i052286; Fri, 17 Jan 2025 12:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HCR9H5052283; Fri, 17 Jan 2025 12:27:09 GMT (envelope-from git) Date: Fri, 17 Jan 2025 12:27:09 GMT Message-Id: <202501171227.50HCR9H5052283@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: 73c073d99157 - stable/13 - mountd(8): parsecred(): uid:gid:... loop: Simplify a bit 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: 73c073d99157d587a5c50b61d63264882dec6ac5 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=73c073d99157d587a5c50b61d63264882dec6ac5 commit 73c073d99157d587a5c50b61d63264882dec6ac5 Author: Olivier Certner AuthorDate: 2024-09-26 16:16:16 +0000 Commit: Olivier Certner CommitDate: 2025-01-17 12:24:51 +0000 mountd(8): parsecred(): uid:gid:... loop: Simplify a bit No functional change intended. Reviewed by: rmacklem (older version) Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46919 (cherry picked from commit ae22a4bb7437019e34fc593e101a6ac14c9d7959) --- usr.sbin/mountd/mountd.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 492d7a5e3647..47bb5758ee1e 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -3643,7 +3643,9 @@ parsecred(char *namelist, struct expcred *cr) cr->cr_uid = name_ul; } cr->cr_ngroups = 0; - while (names != NULL && *names != '\0' && cr->cr_ngroups < NGROUPS_MAX) { + while (names != NULL && *names != '\0') { + gid_t group; + name = strsep_quote(&names, ":"); name_ul = strtoul(name, &end, 10); if (*end != '\0' || end == name) { @@ -3651,13 +3653,16 @@ parsecred(char *namelist, struct expcred *cr) syslog(LOG_ERR, "unknown group: %s", name); continue; } - groups[cr->cr_ngroups++] = gr->gr_gid; + group = gr->gr_gid; } else { - groups[cr->cr_ngroups++] = name_ul; + group = name_ul; + } + if (cr->cr_ngroups == NGROUPS_MAX) { + syslog(LOG_ERR, "too many groups"); + break; } + groups[cr->cr_ngroups++] = group; } - if (names != NULL && *names != '\0' && cr->cr_ngroups == NGROUPS_MAX) - syslog(LOG_ERR, "too many groups"); if (cr->cr_ngroups > SMALLNGROUPS) cr->cr_groups = malloc(cr->cr_ngroups * sizeof(gid_t)); memcpy(cr->cr_groups, groups, cr->cr_ngroups * sizeof(gid_t));