From nobody Sun Mar 1 03:24:16 2026 X-Original-To: dev-commits-src-main@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 4fNnV84cDqz6SvPy for ; Sun, 01 Mar 2026 03:24:16 +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 4fNnV83bHLz43WK for ; Sun, 01 Mar 2026 03:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772335456; 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=5kUKXU2ACmU6HPlHy9aPVctLl/icUXPu655uVkzrOk0=; b=RTq3in886MBa28NO7MSVLhhbZVsAB3HtL7i7QOQP2+XK6gVgTo4qDio118AT8X5sa+BAGU kQD2qiicM6PzL0mm9TF2CGG/JIMMRtEQGeKxWuBx1+YuIy+CGNQgdbj6pubZOAm1l1F0KP EqAqmDHIAoiK8BTKtHGrUs6AcjLIlXW1A0iNVRP5gBGyRJgr9+4ivwtpyRQRq1L8M4IrN/ 44sn7RxRGKhLQOhJihuKu1+4sgILqAUAhnsO8pxFpz8Bm+S486bRRUg1cOxjagQNRzgMrK UYKAoltVB3o2pqzyqRPjC18bANKY609o6606SVRJu93IIVVgtRYnXmoZg+35CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772335456; a=rsa-sha256; cv=none; b=jKJs0hV7AfBzie650DxxaAv3eslh+I0JxKOE3jee9egCZHkk0gxWUrsje14XD9/Sr1A3Oc 2h84j/bM3TZPxzfcAsSryycEHKu3nznP/uazDrlSVSGWxOFiIcQFQNgH3t3KNGnMI50N+G qbp8+75p2PxdygeaEgQkEvWMEgFcbnaQvgwEgldwPjATAlPxLyYLk9EIN0eZW53besvXka +Tg4+b8cS65EU+D+qUqM/FHCBTI+sCXqYEU0Zgbt/1kx1gg0Som5nPQiqh6AW4yO/RHtMY nKGLQs2phrItWYIMAK/7P7fUxT9B8t7GAn8/gDtYjEVSxiH0RRm9OzCFeLgnAg== 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=1772335456; 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=5kUKXU2ACmU6HPlHy9aPVctLl/icUXPu655uVkzrOk0=; b=tHLtU8vBkBK1UkP9NbnE7bJOlCEQE5CGApStLwdpiQrS8CvYHctyh0KUlOCzwfs5mKa3Wy 4OBxDIIU12GjxO/g56012wsBG3QamPiZUNETrsn7jhOwRgcjNE+xWlIcniNYku+5hAS7R4 m4fFakKtT6T6cAUjIdsjk299p141B/LgjSMHtS8eCmLSUOZQpbndGq9aoP2iPkPgPF/Z1J oM6k2B+RoYrJq69t8Lm5x8IZmynLfg6DtL2jus5NBfKMQ/xHuHt73x+qARU0Cad2t9faVu 4pxYRYiSRQX6eyFir0JID5WsXxaQNSGkbIxl6EMdMpsMFfEjfvelxp9VejXYNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNnV83BPrzXMY for ; Sun, 01 Mar 2026 03:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 03:24:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 6da9d465c54b - main - bhyveload: simplify cb_open() and eliminate minor TOCTOU List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 6da9d465c54bf2e3496e83db025c5d22f3b3cc17 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 03:24:16 +0000 Message-Id: <69a3b160.264d7.32722ca9@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6da9d465c54bf2e3496e83db025c5d22f3b3cc17 commit 6da9d465c54bf2e3496e83db025c5d22f3b3cc17 Author: Kyle Evans AuthorDate: 2026-03-01 03:23:59 +0000 Commit: Kyle Evans CommitDate: 2026-03-01 03:23:59 +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. Fixes: 6779d44bd878e3c ("bhyveload: use a dirfd to support -h") Reviewed by: bnovkov, markj Differential Revision: https://reviews.freebsd.org/D55379 --- 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 2b1bfec9a62d..4cc566f334c3 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; }