From nobody Sun Apr 12 13:44:28 2026 X-Original-To: dev-commits-src-branches@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 4ftsGP0LmWz6ZM8M for ; Sun, 12 Apr 2026 13:44:29 +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 4ftsGN3hRTz3l7j for ; Sun, 12 Apr 2026 13:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001468; 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=zDpuEg156J4rY856gnWi2awERfNAUNi6kH0d4Y7WeOo=; b=RW2LtK1eqvsChw0+IT+ScDwMx/y5IgrJI9/qC3ml9trHgGZOvenNm/8RCdrBBnTJyA5Dz8 xhqZgkmicxdpPNm6AlouCwFUyXCVj8xrI7qudAuSxIWZQCY2/qhz/aGr0xo4PXxNwbS5Hi nZATcHISxeSlWO2gpQ6Dt8K+wIl+wQA52Ej3ZGLRMWo4v0GUA9zUyuOWlJBWhsSF0bwVoq b9E1ipGC5RfXB0bIS6ZOwnYzBHwOCByDyMoU88I1dt1B1pCB3Y9gbxmIDtOvoMjidh/6ls 5Wjn1RmEknJGzEB8+zvpAI/2bS/1S1acxmHR+yVjX/cECfQrUTFCubaKUx/j/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001468; a=rsa-sha256; cv=none; b=n0DfuCO6cfg8ipND46Onxz+jIIJSP75KVD3uHfkwtMhqaCdREGPTnElV0MSIUk8i7LOURQ 9Y6wa75R16ssipNC6/iXcjzWaBSCFwpVNqVS0IW8+/IzxdGaG3gyWCNcme+VuyrpuOx+CB Wi+NP0P4Skk8k7WZwXLPTgrrGG2zMBpHHLsiacT4qNaxbn41OPCFxXuY83e2RE4gA6s7Wd oYdrRY2+2/BkCtP2MICaRcTKePmywHQquyKunWrMD9qe+M6edsaSwyt1JrRrvAKJx0xMaU b0M18xTT4oXdL4ui6gDlNPU982tPp6V5B1QbKeSYBeW5VQus/e7T5XrN2KggAA== 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=1776001468; 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=zDpuEg156J4rY856gnWi2awERfNAUNi6kH0d4Y7WeOo=; b=VWkguZN0VvP4e5uGzZtETwbuwoLbxcN1WVdYvj7Sv0SdjfQkjGrl3mU5pLVAFONOPPbzV7 4Lw41R54OGxSQIyN/gLWMHcOv4jwxCuM/PUfz3iPv3+9h9kkIl5z1kDSOqS0px0tXvKPyJ Dl9783243Z1ZFDwHnMnTE+H7SvTlsFOT6/dVUYGL0iJu7m7L0io25AbGI6gq9BqiFfOw2X fCXjuPm+MHtttDZ0ikOzHbT4DdInSXNvxC4jBvGICIDBwtIscbpbvZFiqwrzrBo+zdh35h 0deDoNzyeM/5dD3t0ndz30PyIw4K7qnHwGA1w4ZzqEKgMCzkPjIZckr8efItcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGN31Hfz4dC for ; Sun, 12 Apr 2026 13:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4300e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: c9e676f5f2c1 - stable/14 - bhyveload: simplify cb_open() and eliminate minor TOCTOU List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: c9e676f5f2c114556047d053127b1ee6c4e06ec0 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:28 +0000 Message-Id: <69dba1bc.4300e.312d05dc@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c9e676f5f2c114556047d053127b1ee6c4e06ec0 commit c9e676f5f2c114556047d053127b1ee6c4e06ec0 Author: Kyle Evans AuthorDate: 2026-03-01 03:23:59 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:45 +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; }