From nobody Mon Sep 21 16:32:42 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 4hpTKk3qP1z6srN5 for ; Mon, 21 Sep 2026 16:32:42 +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 4hpTKk38R6z4nW4 for ; Mon, 21 Sep 2026 16:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790008362; 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=oTXQMK6mMhKHadA0b+2M/3PhUmUKxD5YpnCkxfFQ7HA=; b=G9MDxii2b+HwDZbm0GcOSRlqpq6tE3RQhncsG6STvOIZhECnwbPuJFJH0T0fBbGvYBG9Kd +EzCFPUkQuRh7cY3NshFmog8WTBD2Atq2hCYJoLzqSZI6Bx9jfDqamsP7xJTLPv2+vcmzN K8pPuxpFqZHflBGtN4mJ6HU+1TI+3bk4E6xkHjI3b8CKXj47uVUyarEOsZ+e/ryLF1jHrv P63G+TNZXs21/xDTUjRD9JTAlklcJkWNQXx9L5M9MHJDVQp6rffWxPeSRDXGF62OobTIaM 2J2iDpHE7KyZdockoGgEvajmG7jqvWXuFNh299+OmEWVXPLR6l+kcanfc77N+g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790008362; b=J1e/wuPwnPTkS/ibPvTBtte4+R9Kmwc4XWMGwlmVc14iIB07ji8/xLzgqieFBpnjXrGkkJ asWjE/eopMrkr3hMw8pIPIG81bHtCOga35uTAKijGYk1fhnH1k/Wvf2AgDqTEsRqjtkZMS 2exoXXLp4vmGTsBg/Ypdg3s1Y5XHYWpH2gaRAeiLLDHFmrJlfQlhd8jYsE0QQaXnVuyUGg eGw1Eo9IbTNsXIbQzyz7MGaagPXFZlWZ95LPCcju7oiEEQngX0+eE5Omar8N0C5NVuoVDy cGmEQCEav55kTM/eXHZKQ1bVtzaUIVQzlsE90G7rbXFyB2z2GLWEVKoTPzmx2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790008362; 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=oTXQMK6mMhKHadA0b+2M/3PhUmUKxD5YpnCkxfFQ7HA=; b=DNj1ivqUZM8bhlatszUuOHOkwPpvLXn4zeFJVA9k96HhJ4xhsqQpLd2n/odrdgUaONdNsK zzpnfRL1Aa2fLExlI6sEDqjqD58dMZEvbuBUkWq76fsf02Rgv5Fy11XYYAkXYZmPUFsnUP vzka5MjPwZgV+mLYrF7Kv+dCpl3cZlA8fWM5piyRvebwPIGel8TPKl7MC7QQTio8Fm8RLs JrnAC0XEeuyfV4OoavBvcMZib6N7tOLarQ+15z+iKqx3IeTiPi4X1qICamhcPuj/MhIMuK Msqj1Moqv7OwHqX3h/dSdvYBMNKM0wQZAgrkosNpAApfeKxNHi6ctODX2+DjWg== 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 4hpTKk2DPRzSDT for ; Mon, 21 Sep 2026 16:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39890 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 16:32:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roman Bogorodskiy Subject: git: 51234535ddd6 - main - bhyveload: validate character disk devices 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 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/main X-Git-Reftype: branch X-Git-Commit: 51234535ddd6ec0afe9dd4e3f34a31b92d5cdd78 Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 16:32:42 +0000 Message-Id: <6ab15c2a.39890.5fef4ef1@gitrepo.freebsd.org> The branch main has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=51234535ddd6ec0afe9dd4e3f34a31b92d5cdd78 commit 51234535ddd6ec0afe9dd4e3f34a31b92d5cdd78 Author: Roman Bogorodskiy AuthorDate: 2026-08-28 17:51:31 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-09-21 16:31:34 +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 --- 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 154afd4ce398..fad875fc781c 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -365,7 +365,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) @@ -732,7 +739,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); @@ -742,11 +751,30 @@ disk_open(char *path) fd = open(path, O_RDONLY); 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 @@ -829,7 +857,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':