From nobody Fri Oct 11 15:43:16 2024 X-Original-To: dev-commits-src-branches@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 4XQ9rN5x3wz5Z3Wg; Fri, 11 Oct 2024 15:43:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ9rN57Fzz4vF9; Fri, 11 Oct 2024 15:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728661396; 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=P1dqqMMq4ks7JhRCmq+yskYBjgBsJLrlXXF2MzykxY0=; b=q7qYrddaMbNs2KbdmhF8zpO2fwP7GFVbZKvDFwf8RIirVpOtMIetXYQl1/jDAUW7t7Cpwa pP0Clg65z+Powy69hWDZTYJikN7NGNfi6qjUybqqiqc7obe6QcbRIhJIY1IVIIPcSSiOct Ymjhud1vjaE8t3qhggUuLYrtq+QSZTf0W+Zs5OrqjMB4T5pU72THXxNTaY+RwdoCrPb3aO ovy8c5BqEDd6rXafVa7svvM//Mm4VqZBuu9WJzAa1J3zOSIpWc/FSpyFMuf1Y0Q1vm1cyl /XtVjsmAwP7Q2QOyzOb1lZ6x4nAKBpoMaENWRZ8w6o6ntUk4l5p/oepFw2e8/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728661396; 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=P1dqqMMq4ks7JhRCmq+yskYBjgBsJLrlXXF2MzykxY0=; b=ZJYTD9ZzDXRL6bu1K5EoEFZUWDHQo80XBAPbD12j1gTGfpojtGvnzvUx1iTgngAjYg0jIx oSHJUUP7zIIJir5TePM477tmiudNbpkfQrm17XdXeWJyOk/Qg3IBPp/WkrwshzNsO5yArL PahAZ3MxaxNbqLnmLNvaY+03YKMVnaNUfX2Nz8gFoJ+hym4vtmwsi9ecsd9Nmv2/3vrfNX aBL6+aouFIKqRs3SF8DtwQ3ngoX13YRVHx4qpPWipDdHlXpoJy7df249vyJVoPRgWrhCDp 7f1r1DGgMrJJJ5SrYXB4KDvYClPLTvRVhqtxXDKelntEU3l9LCJkZudFawWwuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728661396; a=rsa-sha256; cv=none; b=Y+q41gvn3xyOkncElEkLkCHmXVD4SS3evgaicRi8Ae/BI7nctVoj8iRedSBCPGTNfEooIg dZNmjcXFUHw4g3ER6ameb6fEIfErNnoTf7Ke88+lwmTp7HHS4Q/X69wxD9QLRFF3cjAfad h9OHbqRhOaYUyVPtCR/LxtJb6Zxnx4vud4/fHkzRtPqD1ajQnUMROpeUwJlKXV8hluTKMe 9Z9a+gyv+rX1VaObkbLULt0P92Y0r6nK6qr0u8tObcPiaL/LQGBfXqREwJeS7swxkMigwB ue3I659SH/gYV8W29UGXf9xbqXasSfGZV5mtUSrNN3GIPjvLZpwsHgdfjzcreA== 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 4XQ9rN4QhFzmyB; Fri, 11 Oct 2024 15:43:16 +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 49BFhGJl071230; Fri, 11 Oct 2024 15:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BFhG4o071227; Fri, 11 Oct 2024 15:43:16 GMT (envelope-from git) Date: Fri, 11 Oct 2024 15:43:16 GMT Message-Id: <202410111543.49BFhG4o071227@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: c8f75686adc6 - stable/13 - bhyve/nvme: Fix out-of-bounds read in NVMe log page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c8f75686adc6bc2078ade279d838cbc5b1745e71 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c8f75686adc6bc2078ade279d838cbc5b1745e71 commit c8f75686adc6bc2078ade279d838cbc5b1745e71 Author: Chuck Tuffli AuthorDate: 2024-09-19 15:11:30 +0000 Commit: Ed Maste CommitDate: 2024-10-11 15:42:40 +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 Sponsored by: Alpha-Omega Project, 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 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;