From nobody Tue Oct 29 18:49:50 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 4XdK7M0tVdz5bn1p; Tue, 29 Oct 2024 18:49:51 +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 4XdK7M027Yz43w9; Tue, 29 Oct 2024 18:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730227791; 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=PCb/CMyBsutBqZe411AVWugeQf7di5nbKgWc9sGl2dQ=; b=q+bD7mvvd19lnCTy47bOV4WnAOcmNsxChlRLVqJZhPmxxu+zQ+xKxgRH79O+9uTNqHGwKD U68kSNBXiNnqIsSglMXWl5S2ZlpSua2rZajYFCu0D0hjffyfhaMHiyaSHkKxecLfjkMXkj wi+JOw+2aAa7JhMRmjH4s/KuLpbRokfSQiprAmLg11vhJD/nMmZaImjN8uYFXLd+GAe8g2 Ndssn5/UGSlPEHlqppTQdbb2cZP59wQOZ4r5YWjfq0URxCmBkZOMU071VcpvbZRRNs9EHW W3Ue3WazA5/7Sjxy4lwlWwEcH2CQzNL+FaVTB9qxi5NaGeYq9RAf9btATmorHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730227791; 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=PCb/CMyBsutBqZe411AVWugeQf7di5nbKgWc9sGl2dQ=; b=ZGS+i4FvhdhtM5gZ7flS4P0eZPirge6OSn1aSLLsh9Ib6XFS26z3YVe+OYuwA1rRDrrZlH QD3PsXJ7zIvI2+NY8s/42oTMlnGYLklsDPxPoCoStRb95FTIOSbiqs19YDwJgjQkso1dk3 IowXmd53AoseFqfT2fBoaWFd/arM5fLec9d+qaPMk/nNH4xZRJSFlNWFaeJNGGnuurxsFM xCvBtVDEqZDQTuC1qFTCcB/gP6sYd2mGxprkFJrxPAeMpxPnFfVCIJl1tLQ8VQCGqnIGmG cwcx1ZpNqoBo6o/DhI4VfL5+HvEw/2ALqgKqkdo7gwS977Bh2CimtB+PnACDeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730227791; a=rsa-sha256; cv=none; b=sUTVmg9SopstQZsgz6WPV9x/dBmgDH+egyGnJH8qIDRDQgxZzfHJkTevYOd8w86Pl3434r hSGEmHMQJQ/NOmfDFJ+qkBYnggRDyEZRWdLUHC2grN365qX2VD9IDopTXPk5bM70ss/wTa /QhcoomXLnNIJJ/TITUcrS2qsYaV84dJtjFB4BAP0YAsyv7OCbMJFV/wQZFNP2E9UCf0o8 XIoeUsChRoIG3SrXBnbBfc0kGEoDFAZkH69ySqsyPN5cxxm3c9gO7ExklBriwYTw4R5vc+ rmCrmTXPMYEW6CMq7tq26cJ8VYFy/M33HC8tWX8qVTfgq6Ip1yvtWi6mYFdGyw== 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 4XdK7L6kS8zbLb; Tue, 29 Oct 2024 18:49:50 +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 49TInoLU018492; Tue, 29 Oct 2024 18:49:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TInoLH018489; Tue, 29 Oct 2024 18:49:50 GMT (envelope-from git) Date: Tue, 29 Oct 2024 18:49:50 GMT Message-Id: <202410291849.49TInoLH018489@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: 088b759baab5 - releng/13.4 - 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/13.4 X-Git-Reftype: branch X-Git-Commit: 088b759baab52e65eb13eb171e810d9bdda41bed Auto-Submitted: auto-generated The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=088b759baab52e65eb13eb171e810d9bdda41bed commit 088b759baab52e65eb13eb171e810d9bdda41bed Author: Chuck Tuffli AuthorDate: 2024-09-19 15:11:30 +0000 Commit: Ed Maste CommitDate: 2024-10-29 18:46:00 +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: The 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) (cherry picked from commit c8f75686adc6bc2078ade279d838cbc5b1745e71) --- 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 3db306a19119..cbe4d87b6f60 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1454,7 +1454,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: @@ -1466,7 +1466,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: @@ -1489,7 +1489,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: @@ -1501,7 +1501,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: @@ -1513,7 +1513,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;