From nobody Tue Oct 06 16:40:03 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 4hzhnH6TmQz4n9s7 for ; Tue, 06 Oct 2026 16:40:03 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hzhnH5scPz4ppd for ; Tue, 06 Oct 2026 16:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791304803; 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=3tEoxgkXI44Z3MQWJ6aHBj+qNRh+XjnNXzx9EY5cu0Q=; b=DihJ2BzCLXyhvaZ8g6RvWdiS7RHEZkmAbLLAQ5Onrum1oeXeWOuIZ0h+ULwnQZ8Zxh5DRZ tP5hQmrDqKqrZTyTeSzAoFrUZyal30f89RLxr75UldwN6O5ia7bNVKg5McCjSmz7WBapGA xeiHa+O9MArUlvutwZNhysiMNNQUSRLi8+VrKnLF0V8Cyp/gmRvvN9k+9JTGdjuYRSJbTM aL/X9i3btb2OGvAUOTSzS/YyiwDuu/ChgCrCaBgEeL39HFltYG7gaDHK+pAZgG8VTiN1Gr Ec8xvNLk6NI3rQzPlBnRC1p7OejzUkwXdBXmOLeHSyw2Yc4dVLGuxYwieI7uOA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791304803; b=ce1JE/eci7Vf81FNNbVk0nAFGzzKFXdP6bAkdl69Y7WGYAfj6aLYziA6T8FVplezUVo/ah 2Ac51v7iV5j61t3eZ4OWMI7KhjFn7mEkjOEzOKWzFcwkEsaw/azy5DaurIF312/1OSKWxT AyST14Yqh+gDWUuT2l2Zpk3becQnh24dkMFTM9XdxHBVMDr662Ub2GQ3OnUgiNY9yqVqMY S9ePc1j7iQrDtQmotdgPMdlSgk/7vH4Uob7wJJHdswVK3FeLk9iZ2Ug4DO71rYkAZK/p9e tgJfdLGI7lTMYZ0cn/49oPkMuOiDqd0CGTY9YZ00sNJ3Vs0gB5pF+2qwJQKdzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791304803; 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=3tEoxgkXI44Z3MQWJ6aHBj+qNRh+XjnNXzx9EY5cu0Q=; b=MPqZDHNdeeREICEMwt3QE4WZr6lRG8xNSFRpOTxTv3lgAu+tzgFjSiPwynkLNtFNuD8WQV gNYru6OPj7e5WEVTwiZN3dammFMc5MdiKTmv+po1U3b8oANYse+2FTWTaR8tetrF2PgkNp q6wYh7CVLp1Kynf2fbv9VBwBDS6t+ToT1IM2s5RIjGh8s/dSxZE942BxvquO9yd4zuVPlr tIz+6j6GXuAJJL9SwX0qWdW/Ibk17njvlG6pzxtn8/WIBQYjvIBxyC5UIUkeaZ9+rWGnrz ywQYvVWs/LUI5F2VqRiU3/f2hoZVJpEUyM8XIoZKHTRhzy2pZvkBZRAtLfGsJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hzhnH4qMGzF2B for ; Tue, 06 Oct 2026 16:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30c2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 16:40:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: b3b90afc9db7 - stable/14 - bhyveload: validate character disk devices 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b3b90afc9db7e2d2ed8a1c58a1063b5d4901e01d Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 16:40:03 +0000 Message-Id: <6ac52463.30c2f.4ea78871@gitrepo.freebsd.org> The branch stable/14 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=b3b90afc9db7e2d2ed8a1c58a1063b5d4901e01d commit b3b90afc9db7e2d2ed8a1c58a1063b5d4901e01d Author: Roman Bogorodskiy AuthorDate: 2026-08-28 17:51:31 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-10-06 16:39:39 +0000 bhyveload: validate character disk devices Currently, bhyveload(8) does not validate the supplied disk image path. For example, it allows passing the /dev/null device, which later fails in userboot because it does not support DIOCGSECTORSIZE and DIOCGMEDIASIZE ioctls (see userdisk_init() in stand/userboot/userboot/userboot_disk.c). Fix that by checking DIOCGSECTORSIZE and DIOCGMEDIASIZE ioctls early. A similar check already exists in bhyve(8). While here, make cb_diskioctl() report the obtained sector size instead of hard-coding 512. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59253 (cherry picked from commit 51234535ddd6ec0afe9dd4e3f34a31b92d5cdd78) --- usr.sbin/bhyveload/bhyveload.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 3ee5f7ac7129..3f29d642461d 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -364,7 +364,14 @@ cb_diskioctl(void *arg __unused, int unit, u_long cmd, void *data) switch (cmd) { case DIOCGSECTORSIZE: - *(u_int *)data = 512; + if (fstat(disk_fd[unit], &sb) != 0) + return (ENOTTY); + if (S_ISCHR(sb.st_mode)) { + if (ioctl(disk_fd[unit], DIOCGSECTORSIZE, data) != 0) + return (ENOTTY); + } else { + *(u_int *)data = 512; + } break; case DIOCGMEDIASIZE: if (fstat(disk_fd[unit], &sb) != 0) @@ -718,7 +725,9 @@ altcons_open(char *path) static int disk_open(char *path) { - int fd; + struct stat sbuf; + off_t size; + int fd, ret, sectsz; if (ndisks >= NDISKS) return (ERANGE); @@ -726,11 +735,30 @@ disk_open(char *path) fd = open(path, O_RDWR); if (fd < 0) return (errno); + if (fstat(fd, &sbuf) < 0) { + ret = errno; + goto err; + } + + size = sbuf.st_size; + sectsz = DEV_BSIZE; + if (S_ISCHR(sbuf.st_mode)) { + if (ioctl(fd, DIOCGMEDIASIZE, &size) < 0 || + ioctl(fd, DIOCGSECTORSIZE, §sz) < 0) { + ret = errno; + goto err; + } + assert(size != 0); + assert(sectsz != 0); + } disk_fd[ndisks] = fd; ndisks++; return (0); +err: + close(fd); + return (ret); } static void @@ -814,7 +842,7 @@ main(int argc, char** argv) case 'd': error = disk_open(optarg); if (error != 0) - errx(EX_USAGE, "Could not open '%s'", optarg); + errc(EX_USAGE, error, "Could not open '%s'", optarg); break; case 'e':