From nobody Tue Oct 06 08:53:33 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 4hzVR62wkkz6ccnc for ; Tue, 06 Oct 2026 08:53:38 +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 4hzVR62BFxz4hGZ for ; Tue, 06 Oct 2026 08:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791276818; 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=v/WB550Hi5AU4HNE7yEq0XxrWRhid3op3I/9l8+rsXY=; b=pebp0vHRzOxICkMH+BiothRdx4Eq5JEWzpLBpsKXyfnwqdAVSZlMKNeROugJgtJr6nVPcR kF7OV+JNefKHFPy4h7ouNwJXxbo5UuAZGzSKBtE5tB8FXleAxzReXKbf1FMpSAuqTJhvTZ sP4261wbSs1nEuji1utsVLQJScMdsd1u4f84BphHbT2nYB4ixX2079FeLr+z6zWyNwedCG 3m4vw25weqRzlQ8NgSt/mDykFIJrLjg9/XfE9PJQo74lH+rhogSEpba+r82P0IzCnfUWTR TDkYuw7X51Zi4xsAGJzWMDmlMgAriQCLjybcVdN9k1sSwIkVOGKSwcj0tloG/A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791276818; b=vNDiGyoe67niMRAO8QCZYzaewg9oFtC1XRBpldwvZoEbzKhzwKJgHdaetWLTabSXK4tsuN AIMBZ/0gS3j2YqoWbUgAlk1pdzSNmW+5RewIY9B4by8QsXn4oHbNdURfDF1EwwUaDYYKOr Y0/TpH26D9Mt3x8dvl+M2PSw/t8Mkx/N6mFYb6DrY8Z4YeZTKnTsijs3VxD8cLP0PvOoa5 mHXR5L6Wr2L5fsx2PQIZoDW82/f8MABu+JGnoxSpiNm4rVJt4UnDXj2uG4+jzeYll2b8VI eHJ1MTk9MJfWJolVk2MXK35/eJv/OmpVhE0XDyxEJdhPqfjx/KgYL4jw49lYLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791276818; 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=v/WB550Hi5AU4HNE7yEq0XxrWRhid3op3I/9l8+rsXY=; b=eZ/Invd+m+tDwoGG+K0rTqGc25zU3TRUJK1s0lX2TDx0t83YohohmxSjjfs/AD8Sb69CqJ g/trmX3Dvj79Wrt+GeteCycyVdcHpO021zVWKpd7nu/KEX2Jt+cXHORfv+S9bbew9Cqlef pKAek/DYiua7ujUKXou53iA/Frp/mGNmqBOYhc+4avDZkC/wiGpIzWb8OxIMcCWhP4z3py XSlxjiE6PkxS16FBbFXrUg35+RY7pFPoMWY43kTRiINAy30Tk5XDcNyQcRxQUSYH6aJnOs B6/h3VN7ptWwwXxim5S/YWT5v4Oz58cDrd3m5zgia71wemqjdcI819fjlQbXkA== 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 4hzVR60yJhz10QV for ; Tue, 06 Oct 2026 08:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fe21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 08:53:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: 35aeff778dc9 - stable/15 - bhyveload: validate character disk devices 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 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/15 X-Git-Reftype: branch X-Git-Commit: 35aeff778dc976fa48b3a165dd80a92eb452f5e2 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 08:53:33 +0000 Message-Id: <6ac4b70d.1fe21.7f8ce6cd@gitrepo.freebsd.org> The branch stable/15 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=35aeff778dc976fa48b3a165dd80a92eb452f5e2 commit 35aeff778dc976fa48b3a165dd80a92eb452f5e2 Author: Roman Bogorodskiy AuthorDate: 2026-08-28 17:51:31 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-10-06 08:16:43 +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':