From nobody Tue Oct 29 18:45:32 2024 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 4XdK2N3xhzz5bmwK; Tue, 29 Oct 2024 18:45:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdK2N2zm7z41LK; Tue, 29 Oct 2024 18:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730227532; 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=ps6PEnHGyOz7ZAnx2fMW15xpYizi9dWgLTWMGBUd79M=; b=L1FHWdUfGgJtWASKzH529lKv/idyaVdbHeDa4wwsMcZNED9CfZJpkdjLV2MVvXk/UAs1kX A1IYq2l5vdgS8SXH8GjRz7pktZMbMGZqfe4aIyB+ysP7jgFnQnkhd2LMPJ/oDxxqdUh+Vj tS2QJAx2EGhzfm4pgN3QSHCgNfXgqb+pCnVieFPUWuTIrlbhGHp2mZIHkMl89fkg1nZr03 0ZrRRkaNQdD0WnuItX1r14ZfigziQhj5S5sIMOLJSABC9fBZdWppiXVMPXkXtnMcINJAxz fFxFbdkli70QXSSUxAJXCeDUNyy31RlsCIQDIH2A9y5+2uatR/DyApvDSr8r+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730227532; 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=ps6PEnHGyOz7ZAnx2fMW15xpYizi9dWgLTWMGBUd79M=; b=F6IuUg7c+kMb/iy+O2i5XnpRiYN7Aeypcwz0ekik5l7ts0uIuT5cqLccWoUqmvBrFmfhO/ 1aHj4UqZB8HLZEqi4PhoBIdQfYZysDWGRCOljO/x8ehItmjzIJ12ikbtodPS7Lf6LAhncf fDBcL9jgjNeCyojkM+3G3eQpqZYMyRVExNabRzugL5EV4noVQxx3kc59TflNkTVpFZM2wU yzXI3h3jSUQkJkQWHfJ+b//UHbjC01UDJGxWUWsMIRZG56gZKj0JeVNd/yh1Gab68FudC0 CUSGt55IbRRD/SrIl7xDQQ/IqJ7O6VPUDlp7Czc6h4DidCh65X41OUz0z7654A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730227532; a=rsa-sha256; cv=none; b=XR6v5jNLaMBCKVI1aKCgMJpJGD04U5BwjEM7QV3HVQFPGNP+a6RWK8pJhdReoCDhuD6lqZ DCj3D8HJM8f5bMroZSfoJiPfUZuUf8p0fLo9xym/C/oWY3qGb9uNdoZ19rFkWGy9gqp8Pm 4NjFB50ThBDItXrKFOwrKpDJUh11X58K5E+D0Bi6UEBiYS6YImlNn8IPsCI5WSTEf85wLL 5a10ouhn2woNriDNiR4HhHW7+Gt+HJmR/N58GwOn/+YN3NIyDjp661CzI9NqXsAoIydPJe ZykL4+jELhBZkMj8YqLKSybz7GJCN74dcM2e34QGe5Z1Q5Y1ebn2Ipm8JQ2qaw== 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 4XdK2N2bBszbZn; Tue, 29 Oct 2024 18:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49TIjWab016869; Tue, 29 Oct 2024 18:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TIjWvh016866; Tue, 29 Oct 2024 18:45:32 GMT (envelope-from git) Date: Tue, 29 Oct 2024 18:45:32 GMT Message-Id: <202410291845.49TIjWvh016866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 97a933932e96 - releng/14.1 - bhyve/nvme: Fix out-of-bounds read in NVMe log page 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 97a933932e96b5ea500b73477c5761f1943b8d1c Auto-Submitted: auto-generated The branch releng/14.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=97a933932e96b5ea500b73477c5761f1943b8d1c commit 97a933932e96b5ea500b73477c5761f1943b8d1c Author: Chuck Tuffli AuthorDate: 2024-09-19 15:11:30 +0000 Commit: Ed Maste CommitDate: 2024-10-29 18:41:42 +0000 bhyve/nvme: Fix out-of-bounds read in NVMe log page The function nvme_opc_get_log_page in the file usr.sbin/bhyve/pci_nvme.c is vulnerable to buffer over-read. The value logoff is user controlled but never checked against the value of logsize. Thus the difference: logsize - logoff can underflow. Due to the sc structure layout, an attacker can dump internals fields of sc and the content of next heap allocation. Reported by: Synacktiv Reviewed by: emaste, jhb Security: HYP-07 Security: FreeBSD-SA-24:17.bhyve Approved by: so Sponsored by: Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46021 (cherry picked from commit b0a24be007d83f7929de5b3fc320a29e6868067d) (cherry picked from commit a5be19efbb7c6b07d574ef048b2ebade00440873) --- usr.sbin/bhyve/pci_nvme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 2fd49a84c768..a2e52ece7675 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1402,7 +1402,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, logsize *= sizeof(uint32_t); logoff = ((uint64_t)(command->cdw13) << 32) | command->cdw12; - DPRINTF("%s log page %u len %u", __func__, logpage, logsize); + DPRINTF("%s log page %u offset %lu len %u", __func__, logpage, logoff, logsize); switch (logpage) { case NVME_LOG_ERROR: @@ -1414,7 +1414,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->err_log + logoff, - MIN(logsize - logoff, sizeof(sc->err_log)), + MIN(logsize, sizeof(sc->err_log) - logoff), NVME_COPY_TO_PRP); break; case NVME_LOG_HEALTH_INFORMATION: @@ -1437,7 +1437,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->health_log + logoff, - MIN(logsize - logoff, sizeof(sc->health_log)), + MIN(logsize, sizeof(sc->health_log) - logoff), NVME_COPY_TO_PRP); break; case NVME_LOG_FIRMWARE_SLOT: @@ -1449,7 +1449,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->fw_log + logoff, - MIN(logsize - logoff, sizeof(sc->fw_log)), + MIN(logsize, sizeof(sc->fw_log) - logoff), NVME_COPY_TO_PRP); break; case NVME_LOG_CHANGED_NAMESPACE: @@ -1461,7 +1461,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->ns_log + logoff, - MIN(logsize - logoff, sizeof(sc->ns_log)), + MIN(logsize, sizeof(sc->ns_log) - logoff), NVME_COPY_TO_PRP); memset(&sc->ns_log, 0, sizeof(sc->ns_log)); break;