From nobody Mon Aug 29 22:37:56 2022 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 4MGlh42z5jz4ZtcZ; Mon, 29 Aug 2022 22:37:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MGlh42RMPz3nsC; Mon, 29 Aug 2022 22:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661812676; 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=3S+K2BXumsQ3VDlEmnSoqR0+NnORFm1J/+pi4epPKSY=; b=pVFZ3lyOYbjgX7HkUAQb868u8oLPP3TB1GB+BWjCbn2EnQyb8hMUCqKpPucCpuCG6cOTL0 1ySijy0QSYska7uTeXYNufEs75bdETyUnxDr7tHnftRkknMNeYOr+ZBSzVEOQYSwhz8AnN u3yLGni9jlLMwgTpYjCZoemr6wVc9Q8na8nH1hWJXuw/q9+kWww9hkTGd5WVTqkLghI9d6 i8J1At8GTxWzv7l/IacFmOcvFJ9yrJnJKv+fHs3Ho+TkRGHYOByxTu50TZwXqgzvoFVkPV 6OtwKZ9ewlFLUIwo4Q/0J69Em6ZSEoMhM1KnkxT34ahkbum53tNHlQNMDJs0qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MGlh41GQlzZrZ; Mon, 29 Aug 2022 22:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27TMbueg023176; Mon, 29 Aug 2022 22:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27TMbuPB023175; Mon, 29 Aug 2022 22:37:56 GMT (envelope-from git) Date: Mon, 29 Aug 2022 22:37:56 GMT Message-Id: <202208292237.27TMbuPB023175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bb31aee26bd1 - main - bhyve virtio-scsi: Avoid out of bounds accesses to guest requests. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb31aee26bd13307d97c5d5bf2b10bf05bdc18fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661812676; 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=3S+K2BXumsQ3VDlEmnSoqR0+NnORFm1J/+pi4epPKSY=; b=Ht89eZlSFXBtmc7YPYNV8ykeLoKutRHThECASdtvPcuQYKUgoy8TNgbSNcoZPGpN7D6Vr5 /DD4NSk7AsOTL0hysr+Crzeb9Yeiy5xe4OdJAvWlQPV5y/bp00C9aW3/czhBkbnVZ/N+VR zHpW7iiFoZB2PVgbFSQiRvQlk/fz1YtZXsdILDjVVZv2D5YNGMCOGRYitSk5a5MDEjxBSP 98u+H4SJBP5I23hM0VFCqPPCR0dCa6RYbneZ3hE0BSNS1ao/unE0PebaybUMT2Sch3oMvj hll+aOcY3o9Y5+rpAMP0zSQz0ybe6I5o3vUmv9xXwfsg86ekNKMSSF7X7GnQTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661812676; a=rsa-sha256; cv=none; b=OiNIOqp3hkqK6Klu20Lk2hsZwIxZZ3qMCOpwa6KQRkMSLpKdInnyUHNOUELmnF2hddqOSw U5Qgb6KSAX+Mp70xZwC96nF6BvQEPMuSnz+mPEwM64WX1yaaqaOnA3LSWuxOh/RMr5ki+L 6RlBR+CdeuCZFTaLKWDmDxNj7GIDrcVEzFx/LmPVRTj1B/IDBmfhWFoXBbWXluSzPSifA3 Co2/Uk79nkxeTi9I0pdcxtAjg7wrzcaEn3GB0hXR71gUSRFnOw1VQegTk8v64acFberocK tv5cz7wknj6zV5JDq7SQqIIIemh09JRfWtVb5iURcewBCtVC5C+H2iXNv0MlIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bb31aee26bd13307d97c5d5bf2b10bf05bdc18fd commit bb31aee26bd13307d97c5d5bf2b10bf05bdc18fd Author: John Baldwin AuthorDate: 2022-08-29 22:36:11 +0000 Commit: John Baldwin CommitDate: 2022-08-29 22:37:27 +0000 bhyve virtio-scsi: Avoid out of bounds accesses to guest requests. - Ignore I/O requests with insufficiently sized input or output buffers (those not containing compete request headers). - Ignore control requests with improperly sized buffers. - While here, explicitly zero the output header of an I/O request to avoid leaking malloc garbage from the host if the header is not fully populated. PR: 264521 Reported by: Robert Morris Reviewed by: mav, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36271 --- usr.sbin/bhyve/pci_virtio_scsi.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index 6d867e7e3b56..b50b6e9fd047 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -364,14 +364,27 @@ pci_vtscsi_control_handle(struct pci_vtscsi_softc *sc, void *buf, struct pci_vtscsi_ctrl_an *an; uint32_t type; + if (bufsize < sizeof(uint32_t)) { + WPRINTF("ignoring truncated control request"); + return (0); + } + type = *(uint32_t *)buf; if (type == VIRTIO_SCSI_T_TMF) { + if (bufsize != sizeof(*tmf)) { + WPRINTF("ignoring tmf request with size %zu", bufsize); + return (0); + } tmf = (struct pci_vtscsi_ctrl_tmf *)buf; return (pci_vtscsi_tmf_handle(sc, tmf)); } if (type == VIRTIO_SCSI_T_AN_QUERY) { + if (bufsize != sizeof(*an)) { + WPRINTF("ignoring AN request with size %zu", bufsize); + return (0); + } an = (struct pci_vtscsi_ctrl_an *)buf; return (pci_vtscsi_an_handle(sc, an)); } @@ -468,6 +481,15 @@ pci_vtscsi_request_handle(struct pci_vtscsi_queue *q, struct iovec *iov_in, uint32_t ext_data_len = 0, ext_sg_entries = 0; int err, nxferred; + if (count_iov(iov_out, niov_out) < VTSCSI_OUT_HEADER_LEN(sc)) { + WPRINTF("ignoring request with insufficient output"); + return (0); + } + if (count_iov(iov_in, niov_in) < VTSCSI_IN_HEADER_LEN(sc)) { + WPRINTF("ignoring request with incomplete header"); + return (0); + } + seek_iov(iov_in, niov_in, data_iov_in, &data_niov_in, VTSCSI_IN_HEADER_LEN(sc)); seek_iov(iov_out, niov_out, data_iov_out, &data_niov_out, @@ -477,7 +499,7 @@ pci_vtscsi_request_handle(struct pci_vtscsi_queue *q, struct iovec *iov_in, truncate_iov(iov_out, &niov_out, VTSCSI_OUT_HEADER_LEN(sc)); iov_to_buf(iov_in, niov_in, (void **)&cmd_rd); - cmd_wr = malloc(VTSCSI_OUT_HEADER_LEN(sc)); + cmd_wr = calloc(1, VTSCSI_OUT_HEADER_LEN(sc)); io = ctl_scsi_alloc_io(sc->vss_iid); ctl_scsi_zero_io(io);