From nobody Tue Nov 17 16:35:40 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 4jTVhs2g58z71Mn7 for ; Tue, 17 Nov 2026 16:35:41 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTVhs1Rp6z3L1w for ; Tue, 17 Nov 2026 16:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794933341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g8NQs0Z/WVEK1N6jOEV2Q4+ON4lLTAzLPOQR+9eQlIc=; b=bv8JDtGcUpOB5lwbS7B/eYaRHSxAQFpMzdGIT5ybopcir0oW8KRojwhriRGig3ffGLZUBt D9Z5zwBrQcuXIiEqGWofgjwz81vRrNyUmL+eduVUuuuTaid7NlJ1daAhkd6iCsKfNjZoqg 1sQJqv2VfA9+IqFZ6ZGvEkrJG4TIFyg5GpVYEYsfGrlB4frO1uUthyh9jptyQTmSYeivsg EtORH4SG0ObFxVdUhdn5E8u2UzpSvV+Q77XVg/K6eyR0XXEg+j9R9q4OwtqehhGtbCA5az JJKT0glfO4qoYLac+dDYGeNR/VYVd1hesFDb1lWjXAib7v5Ff542OzwK8ZUljQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794933341; b=rUrFSqjOizyowruisHP/KGvWbpB0emaiV5v+gAenLFobtK6ZU3qbgECG0V0HkisGq0T+g3 0ugEywocOoqRDympnaQ+2ncKu1U9HbRkhVh3HG0IKIP6Cg4Zc+CZt6RBIzS35t79ZWgyqj 1lwRKcTHpcjdwLyaxvICevoJxyPgDsmDhvlRwoQMNUQF4azoloCdbS33HICtzNulzuli+P TnkLCfNSxPOYLbyn+m9VkR4otNilKMbFurD0ERcVxQ5cJMEuNefpf0XKrdLL1i1AP9El80 nTIwdf2PZkixTetbqByB8ChLvdUJQVbFnkz0dHzMKtD2hnq9jGuSnndRT1iKBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794933341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g8NQs0Z/WVEK1N6jOEV2Q4+ON4lLTAzLPOQR+9eQlIc=; b=iHQ2HRr6FyzbgJsOLXGydnhiGMyjOyaeGSQg+T6sYdrKA91wnIfac2EhLdNdNsq80NLpZb LQPiN74tP6xW+nHoaVy19A8iRoTrk4rXSTbBs3TExod8shQKlsodwAU+T4FaiO8xs6RaAP +xAD7aB7Qz9Vuf4PUkNbs8t7HcmTUEpDUwnlJfqaGuBwen6xLcVPE0MYtCCdM5k55AGuLN oIiSVrlUKD9ZxFZkRVTu/rW2dCvJvGwwlZRE4yEvpo/Szs2lOZMLZJyyA/FJOGsK28nMqZ wi3fH0ta1K7FmTHH+mC9g/Ek66AE4qIZ4K9IxoxSbDd4McxYFUpFDW2FwG4pBQ== 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 4jTVhs039kzqPd for ; Tue, 17 Nov 2026 16:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1b023 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 16:35:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Osvaldo Janeri Filho From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: fb12aee5f42c - stable/15 - bhyve: check paddr_guest2host return in _vq_record List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fb12aee5f42c8f598cfe18588fad9a7fd1240b56 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 16:35:40 +0000 Message-Id: <6afc825c.1b023.32e0cd70@gitrepo.freebsd.org> The branch stable/15 has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=fb12aee5f42c8f598cfe18588fad9a7fd1240b56 commit fb12aee5f42c8f598cfe18588fad9a7fd1240b56 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-04 16:11:02 +0000 Commit: Bojan Novković CommitDate: 2026-11-17 16:34:48 +0000 bhyve: check paddr_guest2host return in _vq_record _vq_record() stored the result of paddr_guest2host() without checking for NULL. A guest descriptor with an invalid address causes a NULL dereference in every virtio driver. Return early on failure; the caller sees zero descriptors and discards the chain. The indirect path already performs this check (line 357). Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D60870 MFC after: 1 week (cherry picked from commit d67c363e85e7c720b1e0ac16e30cb64317c0dc2f) --- usr.sbin/bhyve/virtio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c index fa3c5f8e63a7..317c4e6d5eb4 100644 --- a/usr.sbin/bhyve/virtio.c +++ b/usr.sbin/bhyve/virtio.c @@ -48,6 +48,8 @@ #endif #include "virtio.h" +#define WPRINTF(params) PRINTLN params + /* * Functions for dealing with generalized "virtual devices" as * defined by @@ -230,6 +232,11 @@ _vq_record(int i, struct vring_desc *vd, struct vmctx *ctx, struct iovec *iov, addr = atomic_load_64(&vd->addr); iov[i].iov_len = len; iov[i].iov_base = paddr_guest2host(ctx, addr, len); + if (iov[i].iov_base == NULL) { + WPRINTF(("%s: invalid guest address 0x%lx len %u\n", + __func__, addr, len)); + return; + } if ((vd->flags & VRING_DESC_F_WRITE) == 0) reqp->readable++; else