From nobody Sun Aug 3 04:15:33 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 4bvmZF6x4Tz63y0H; Sun, 03 Aug 2025 04:15:33 +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 4bvmZF5mQGz3QmB; Sun, 03 Aug 2025 04:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754194533; 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=+3MiQiZodbutQxV3F+gQfqjyIfbYJ/aujhbUsCJyu2c=; b=h+ISbO3sLXXOinfXxbLnFhZDbFtSk5k0STqPDxE85JHr2VxLjbzfTotSRi+nA0UTt2h57f 1UmqqEq9mQnlDJBdR8Iz0IFSnct5e1Lno83or+yvdkjtI8lqigCjpHB4n6z1SM0EtZDumH PCzCp/IkhDV62xtUFX13urjMVmtDCnjhrkcTs28vzsk/C2fpvepixc5VlzfxvlanVef63P mE5wke0fsftaqSyVEs+qkFChbViL6TKiinOtlQyZyhsKlFReuvIM4pJ6JiD3OHTIEH8TX0 86hseLHAfZPgAkcuLPQUSVeQvkGnwEwMHqZVb7eXQ9nMVm+ZhsoCkwag20SzpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754194533; 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=+3MiQiZodbutQxV3F+gQfqjyIfbYJ/aujhbUsCJyu2c=; b=c4FkZ+nmJGplA5Diji0+brO3Uwpd8WlvuqQqA4zYhBnBol2G67iywA2WvXmUe4mrFbj8DF 8DhdeA9wyLC7ugD2m2bPynbsjD3Rbqqz0qho9gSKa7iXMHJ/odny484SSvUsI/GDniBnuP W8ap/kYCq6PetlsQ2qfoS7AO4e86TlPNWUCBvRMAdfTd8IO20A2fSLXJo63OaTpfpQu9wp PQfM3aAI5wGpfsdjD+zu3iObHFyBiTj8KwpTTz40Syuom8yE/U3bb1yCY8ks/j6RoRSDp8 Z1/HeGJE0kmriJXnVDywYZ9GOuabyb2/KHQjiNu6LfYK3vXsya5TlO8gWx9tqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754194533; a=rsa-sha256; cv=none; b=WPwqvr9YNQTnMRH+gG2okaPzQ3qmevjIvjTHp+XeXVdDdwrVjDJc6IgLOXsc1s0NTDVwIN mp2k7N4Nc6cg5n1rN+uz90qG7q/bY9QWrxG84psBUgf/O1yb2OXZ3YlGl2nMXuH/pGpHq5 q1Qe6nfSrHEhueSu5/O6tqgyIbKXP3Q+AQVku4Nn0ebDSDaXjTmWSA9I+j+C7GC7mB3Pi9 qnvn/3mYuz9c7JxH8n2pzReDmkhFwb/kEm/GOoaGKHbbO6pz7AQG7NQFbhEPj0NlMDEoBP exM3Bvh+474jR07TZJhy61mMYYz5AY3IU8FvOAWIiEEUpw0mwLiOv8lBKlU2xA== 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 4bvmZF58Z6znrx; Sun, 03 Aug 2025 04:15:33 +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 5734FXW6034795; Sun, 3 Aug 2025 04:15:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5734FXAG034792; Sun, 3 Aug 2025 04:15:33 GMT (envelope-from git) Date: Sun, 3 Aug 2025 04:15:33 GMT Message-Id: <202508030415.5734FXAG034792@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: 91eb4d2ba4de - main - chroot: slightly cleanup 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91eb4d2ba4def0fe0f56f0a61ad7c503fcab891b Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=91eb4d2ba4def0fe0f56f0a61ad7c503fcab891b commit 91eb4d2ba4def0fe0f56f0a61ad7c503fcab891b Author: Kyle Evans AuthorDate: 2025-08-03 04:15:03 +0000 Commit: Kyle Evans CommitDate: 2025-08-03 04:15:03 +0000 chroot: slightly cleanup Highlights: - Pull resolve_user() and resolve_group() out to make the main flow a bit easier to read - Fix some edge-cases in user/group resolution: you can have fully numeric usernames, and they may or may not live within the valid ID range. Switch to just trying to resolve every specified group/user as a name, first, with a fallback to converting it to a numeric type and trying to resolve it as an ID. - Constify locals in main() that don't need to be mutable, re-sort Reviewed by: emaste, olce Differential Revision: https://reviews.freebsd.org/D51509 --- usr.sbin/chroot/chroot.c | 94 ++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index c978fc019c95..8a99a9bbf7cb 100644 --- a/usr.sbin/chroot/chroot.c +++ b/usr.sbin/chroot/chroot.c @@ -47,17 +47,58 @@ static void usage(void) __dead2; +static gid_t +resolve_group(const char *group) +{ + char *endp; + struct group *gp; + unsigned long gid; + + gp = getgrnam(group); + if (gp != NULL) + return (gp->gr_gid); + + /* + * Numeric IDs don't need a trip through the database to check them, + * POSIX seems to think we should generally accept a numeric ID as long + * as it's within the valid range. + */ + errno = 0; + gid = strtoul(group, &endp, 0); + if (errno == 0 && *endp == '\0' && (gid_t)gid >= 0 && gid <= GID_MAX) + return (gid); + + errx(1, "no such group '%s'", group); +} + +static uid_t +resolve_user(const char *user) +{ + char *endp; + struct passwd *pw; + unsigned long uid; + + pw = getpwnam(user); + if (pw != NULL) + return (pw->pw_uid); + + errno = 0; + uid = strtoul(user, &endp, 0); + if (errno == 0 && *endp == '\0' && (uid_t)uid >= 0 && uid <= UID_MAX) + return (uid); + + errx(1, "no such user '%s'", user); +} + int main(int argc, char *argv[]) { - struct group *gp; - struct passwd *pw; - char *endp, *p, *user, *group, *grouplist; - const char *shell; + const char *group, *p, *shell, *user; + char *grouplist; + long ngroups_max; gid_t gid, *gidlist; uid_t uid; int arg, ch, error, gids; - long ngroups_max; bool nonprivileged; gid = 0; @@ -95,19 +136,8 @@ main(int argc, char *argv[]) if (argc < 1) usage(); - if (group != NULL) { - if (isdigit((unsigned char)*group)) { - gid = (gid_t)strtoul(group, &endp, 0); - if (*endp != '\0') - goto getgroup; - } else { - getgroup: - if ((gp = getgrnam(group)) != NULL) - gid = gp->gr_gid; - else - errx(1, "no such group `%s'", group); - } - } + if (group != NULL) + gid = resolve_group(group); ngroups_max = sysconf(_SC_NGROUPS_MAX) + 1; if ((gidlist = malloc(sizeof(gid_t) * ngroups_max)) == NULL) @@ -122,35 +152,13 @@ main(int argc, char *argv[]) if (*p == '\0') continue; - if (isdigit((unsigned char)*p)) { - gidlist[gids] = (gid_t)strtoul(p, &endp, 0); - if (*endp != '\0') - goto getglist; - } else { - getglist: - if ((gp = getgrnam(p)) != NULL) - gidlist[gids] = gp->gr_gid; - else - errx(1, "no such group `%s'", p); - } - gids++; + gidlist[gids++] = resolve_group(p); } if (p != NULL && gids == ngroups_max) errx(1, "too many supplementary groups provided"); - if (user != NULL) { - if (isdigit((unsigned char)*user)) { - uid = (uid_t)strtoul(user, &endp, 0); - if (*endp != '\0') - goto getuser; - } else { - getuser: - if ((pw = getpwnam(user)) != NULL) - uid = pw->pw_uid; - else - errx(1, "no such user `%s'", user); - } - } + if (user != NULL) + uid = resolve_user(user); if (nonprivileged) { arg = PROC_NO_NEW_PRIVS_ENABLE;