From nobody Thu Jan 16 18:08:19 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 4YYrT01TCzz5kl2s; Thu, 16 Jan 2025 18:08:20 +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 4YYrSz5s3cz3RZr; Thu, 16 Jan 2025 18:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737050899; 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=uimoa9U4yfMVgQxZFBII0YiqaQkLZQr9msrSKcWkUpo=; b=B6PKHWBpKZ1Q1XH7ajNhdcWMXyHnHpmVbFrKW9A73jSXgXDHwLeGDgYNIdve4GBW5qLaA/ Gpteh/hzeQN32DcosrxKTUJFDTaEnUkZuUHYc+YgYuz06DRxStxC8WyGJLg0gQ94kuF+rx oB+UNrMCkLSFq4bno2OfOgDYsfiKY46Cl2pOCNcAH8m3S/tWwRx0Mg1BAbGr1R110++La4 WxY4Dmw+LsQEtmrxYbFpyPout74AgbcBLOgdvrRSmQwNKtNDDN1hyy7Jd97/V7fxUWAYIC J0YZwShKuGv/Ct6Gqs2rt2NkeOH0GYbGiBRhfGwkW399B7pLzJNJ76JCvLUU1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737050899; 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=uimoa9U4yfMVgQxZFBII0YiqaQkLZQr9msrSKcWkUpo=; b=b/XzRxhdypeln6qXO9ZuAbfPKVGPBDz1SInGazcjb+fMTlzg9ZBwDH1qyDubivaVHiv1dH Bc6RrdLShWr6Dt0a+ark5IZ9k9betXeG7uWTR1NAE8+KeCWrObfBfppNJ3QjLjHW4DIJZQ cR3fcPTjCWuSTIw4mtojLIJd5U6LSEBcZA7XaieSI7eUBdPJp8fMZvtaPCJXMFYoEVEIKG tKTXK8fpbl7sou43LBqO3Ah1HiQB3ixLIQSHY2ljVXgVqCSPPPgxuo8VspL22rjKYVKKeb GBWkpD9k9yurGuZ7yjjWjN8dnFF2iJUVFkdfzUlqh4e9RjZwmJIa1psMYhe5og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737050899; a=rsa-sha256; cv=none; b=iU9QBk/ODgnINTXcLwdABQ7wLFr33+h18QCSIThQ8rK7oqU+NM0olh7HyppG/xqfsIL4Pz Nw/jco/fFCXJX3LcrFVsnghlmlAe3xgQ/eD3ZCQxToPL+7i3Dc343vCr+yUJBsVZ84ykTl cZ33NBcdkAKK/ITF3X2ihvE0038QN/3H0URjgPdyQVZILJQpM+2+/s2D7pIz9zV1ooy8kp Q+IaThuKe0eJRXTTzOjqakEVL4T8z47I+oQ5+MeCmHql/zslf/iYSiWDGsB01is4kgyO4V dQ6PXDDKh08ao7rBuYASyeXLjZ0Rkgm/+I1ydeAGtQhIMzVXgLRoBGwd1a6HwA== 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 4YYrSz5G1yzkKg; Thu, 16 Jan 2025 18:08:19 +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 50GI8JCt092009; Thu, 16 Jan 2025 18:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GI8JMG092006; Thu, 16 Jan 2025 18:08:19 GMT (envelope-from git) Date: Thu, 16 Jan 2025 18:08:19 GMT Message-Id: <202501161808.50GI8JMG092006@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: aeff6867a4df - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: aeff6867a4df37bdb3058aa9530480c59699783a Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=aeff6867a4df37bdb3058aa9530480c59699783a commit aeff6867a4df37bdb3058aa9530480c59699783a Author: Olivier Certner AuthorDate: 2024-09-26 16:16:16 +0000 Commit: Olivier Certner CommitDate: 2025-01-16 18:06:57 +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 fa270f3a42d4..e01140593c11 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -3686,7 +3686,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) { @@ -3694,13 +3696,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));