From nobody Sun Apr 12 03:16:40 2026 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 4ftbL06BG3z6YM0r for ; Sun, 12 Apr 2026 03:16:40 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbL04JWTz3P4R for ; Sun, 12 Apr 2026 03:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963800; 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=MFR4LKoiznH/1Tq4ehKogY6QqdHF0a/8sS1Ba/EtCUw=; b=NsNcg/V+pDAfI4la5TdkPYtOefWPO7mtfz5UB7XMjHX8Jv+tOlEMWq2/AsprOv9O1iXWdq zDmQWhK6WysXV/TAEJbmcSMmFEokpVFLg7tsswaqLCd4hEybzZw7X65sM+8tdg6jiWBT60 ivrFPERN2WuCAuFgS/PkAkVlaPuj4bGGBY9KnGJW7P6eZlBRvi8tmW3gKGyirkMKyfPB0Z 2QZbOE/dUeUFMjc+YA0oOyC62jmsM57ToUHQV1sqaBWXpLwqcglhs3wini9inah+iUBhHt aROMs2W5dzmY7lb7NlQ3KZ61s4bQKUT3YEXoGSxphCeiXTEkiJY0Dh89JC0XiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963800; a=rsa-sha256; cv=none; b=vhYSMgeaYWRWaITEd3ou4kFe9E4RHXeWCcflEUHToov2Vg5IJi88dUOZIYgpLtFp8s8p1b E3HwlWHIKLWAmpgi8VU5HKt23+knhyBJrxZB9z2xPYbODZ96Ao9ZQnMnDx6eE6D/MuTZet BU1/gWDRZ6l/lamRQTDxgxp0p1YxWd1T/Zq2vsrjKaf5d6Pq2B7/USuS8N890C6er/qPlm v7uVJaND5zn3SMkVmQJ5hKejsUtP+K6Bz36EjJmDZA2rJ8tc5QPKZEOpOto+M1hMW6/x+h Y7cwFKyiTkdHjqFaQXhK/U/M5hcfyZ7i9slYllQRcSjSeGuigKbDR12EQZEyBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963800; 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=MFR4LKoiznH/1Tq4ehKogY6QqdHF0a/8sS1Ba/EtCUw=; b=X45l9otTq4SNW5MvC3ppu/9G/UBTnmKhvMuqjXsdnDrPjDSictLvIa/0I5xb2ld0VOo5wp EoP2H7g7eZX6tSqENLFBftL62yKsxc6dTxcV19ixNKTXywqbcDxD9qELnDOec8P6J9ET20 XyEw/FLetrSAghVl1jRACoC9mMrtnE21BbRvYZrGRAHmxaKK6D4BWF3ufFo0S31Npgq/8E uZmEGIRhqEOCA65VCgcbx2AZ+tWENCxuPnpFHZGZe8Z1bsBy82mp9LgrwxsKauE6zuG5F6 B6JXlVKC35UB78NQcZvF/4kGkNsxZJMOoenD/0uiBeJ9CO6s+ml7qBHHD80+eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbL03fMGzyp2 for ; Sun, 12 Apr 2026 03:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 470ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: cc5125aaedbb - stable/15 - bhyveload: simplify cb_open() and eliminate minor TOCTOU 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/stable/15 X-Git-Reftype: branch X-Git-Commit: cc5125aaedbb5853f1d00ed57e3ae683fef961e9 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:40 +0000 Message-Id: <69db0e98.470ea.64c91156@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cc5125aaedbb5853f1d00ed57e3ae683fef961e9 commit cc5125aaedbb5853f1d00ed57e3ae683fef961e9 Author: Kyle Evans AuthorDate: 2026-03-01 03:23:59 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:15 +0000 bhyveload: simplify cb_open() and eliminate minor TOCTOU It's not at all clear why I wrote it like this, but we can do better. I wouldn't think this really has any meaningful security implications since the hierarchy in question can't really be modified by the guest scripts, but it would seem to make it a little more robust. Reviewed by: bnovkov, markj (cherry picked from commit 6da9d465c54bf2e3496e83db025c5d22f3b3cc17) --- usr.sbin/bhyveload/bhyveload.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 5250e2120938..be99bb342de6 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -169,11 +169,9 @@ cb_open(void *arg __unused, const char *filename, void **hp) { struct cb_file *cf; struct stat sb; - int fd, flags; + int fd; cf = NULL; - fd = -1; - flags = O_RDONLY | O_RESOLVE_BENEATH; if (hostbase_fd == -1) return (ENOENT); @@ -185,20 +183,21 @@ cb_open(void *arg __unused, const char *filename, void **hp) if (filename[0] == '\0') filename = "."; - if (fstatat(hostbase_fd, filename, &sb, AT_RESOLVE_BENEATH) < 0) - return (errno); - - if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) - return (EINVAL); - - if (S_ISDIR(sb.st_mode)) - flags |= O_DIRECTORY; - /* May be opening the root dir */ - fd = openat(hostbase_fd, filename, flags); + fd = openat(hostbase_fd, filename, O_RDONLY | O_RESOLVE_BENEATH); if (fd < 0) return (errno); + if (fstat(fd, &sb) < 0) { + int serrno = errno; + + close(fd); + return (serrno); + } else if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) { + close(fd); + return (EINVAL); + } + cf = malloc(sizeof(struct cb_file)); if (cf == NULL) { close(fd); @@ -217,7 +216,6 @@ cb_open(void *arg __unused, const char *filename, void **hp) return (ENOMEM); } } else { - assert(S_ISREG(cf->cf_stat.st_mode)); cf->cf_isdir = 0; cf->cf_u.fd = fd; }