From nobody Thu Jan 26 20:27:13 2023 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 4P2sh14Svqz3btJ0; Thu, 26 Jan 2023 20:27:13 +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 4P2sh12HRQz3R2v; Thu, 26 Jan 2023 20:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674764833; 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=7Pjt5gfTvjUix2wlZM6FR/PCs3DUtntvF2notBgvqlo=; b=vIu6ierfTrCy27/tODUaP8wuBYi+OIRYa8q0L6EplMLfLA8feLe6iEnqA121/awx0B8/hU RQKUGF7x4H7NolI6Bh2I1QdHVlnFsfxJnWicRez2aofOPNpENViz4VfcVdRlS7wG6IXEFN H23Wa+WXj6jreaD9OgYrvHjAvX0eB4/GNdzSLjzBupnzCzZc3ELG2owwTqmDYqeJOpDMZg CPnV1sVAcQo7Y8J/tLPm6iIU6xYj39RQD9QMFSHSmbwy7X5BWQMJC56kpZs8rdfMwOXvZz UqCGXUY5kdp7G9DrgfOIqMye1oRri0hRJjBXC/VwZtEA/MYb2KAj/WxBoJmTfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674764833; 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=7Pjt5gfTvjUix2wlZM6FR/PCs3DUtntvF2notBgvqlo=; b=OibyI5o2Cp8NfzoAk+rgJdrUoMjfTUFMcAvj7nNV/2nCL9IHszpk9SzyjYGZKcEJy38MZY Ar/ZV6vASWjBLB/w88f6Ycf+hS2zR68yI5W7BJjJLJKuGbbNIVr/wwLscpa4y+OzZVKFPq FtY2auioQp/egFLrsPYkZMq+rEDyo8yBASxJHVKtf46RHYVtnXK3ZYKgnEmeqI4g8NlAak kMsy44tBcXFuhoz+6WqXoeyfp9rAVdzlitOm8ZIY2jDkWIz4nxvJF1zqUnI6jZ/JOf7N90 6fAHPnZnyz69WBeX/zWrKNe8aP8uxc9YvX1nywvuxZPRa9LehVnGZD3swjbtjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674764833; a=rsa-sha256; cv=none; b=IcSOyxHjARzW7ChuhT4VX+WNoxXBrYoQIRHCqi+UrkiC0dz6BsElAq++FqJXFVBc72XF8G cS2W3/7StB6HGkkofHiQnOmGZDJakID/Wdtpdn541ocJJUtUuI/mWWLQ3xEB6g/sqHCAJc my/hfg7LVJYYGjkIKA1dvNlLMwdHu6t+DixLQPM9HPKLtEfnr2JAM4gt70SkeOGZDD7o0D XOymawHf9oKeTOcqKuPMNmSDJ7oZikNaAqVEyvecj8gEs5Sic7yY7EHON/a5JqCjzobolW l8WG9RiaKifjByRr0OVWVdquPITEjQQufIivGuByn5lekShCVjOcCaWTwgqKdg== 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 4P2sh116cnzjPX; Thu, 26 Jan 2023 20:27:13 +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 30QKRDWM064870; Thu, 26 Jan 2023 20:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QKRDKW064869; Thu, 26 Jan 2023 20:27:13 GMT (envelope-from git) Date: Thu, 26 Jan 2023 20:27:13 GMT Message-Id: <202301262027.30QKRDKW064869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3b700550004c - stable/13 - bhyve: Don't leak uninitialized bits in NVMe completion statuses. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b700550004c7d3b848c68e4a7742898f9f98b45 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3b700550004c7d3b848c68e4a7742898f9f98b45 commit 3b700550004c7d3b848c68e4a7742898f9f98b45 Author: John Baldwin AuthorDate: 2022-11-29 01:08:36 +0000 Commit: John Baldwin CommitDate: 2023-01-26 20:23:47 +0000 bhyve: Don't leak uninitialized bits in NVMe completion statuses. In some cases, some bits in the 16-bit status word were never initialized. Reported by: GCC Reviewed by: corvink, chuck, markj Differential Revision: https://reviews.freebsd.org/D37486 (cherry picked from commit 1d9e8a9e60953b148a036b39d1fe7037fdbb40a3) --- usr.sbin/bhyve/pci_nvme.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 6572781e939c..98f4a7de72c8 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1530,6 +1530,7 @@ nvme_opc_identify(struct pci_nvme_softc* sc, struct nvme_command* command, DPRINTF("%s identify 0x%x nsid 0x%x", __func__, command->cdw10 & 0xFF, command->nsid); + status = 0; pci_nvme_status_genc(&status, NVME_SC_SUCCESS); switch (command->cdw10 & 0xFF) { @@ -2383,6 +2384,7 @@ pci_nvme_io_done(struct blockif_req *br, int err) /* TODO return correct error */ code = err ? NVME_SC_DATA_TRANSFER_ERROR : NVME_SC_SUCCESS; + status = 0; pci_nvme_status_genc(&status, code); pci_nvme_set_completion(req->sc, sq, req->sqid, req->cid, status); @@ -2447,6 +2449,7 @@ nvme_write_read_ram(struct pci_nvme_softc *sc, else dir = NVME_COPY_FROM_PRP; + status = 0; if (nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, prp1, prp2, buf + offset, bytes, dir)) pci_nvme_status_genc(&status, @@ -2594,6 +2597,7 @@ pci_nvme_dealloc_sm(struct blockif_req *br, int err) bool done = true; uint16_t status; + status = 0; if (err) { pci_nvme_status_genc(&status, NVME_SC_INTERNAL_DEVICE_ERROR); } else if ((req->prev_gpaddr + 1) == (req->prev_size)) {