From nobody Tue Sep 24 17:30:55 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 4XCn2R2lKcz5Y5Tl; Tue, 24 Sep 2024 17:30:55 +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 4XCn2R1zsFz4WW0; Tue, 24 Sep 2024 17:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727199055; 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=d9SwjTV2rPKjXekxNr4yp+bDmYuVLBRaDlJZGdRlXPs=; b=kMZbOWJILs4jvcJ0JyLQxX/2THCIBaxYc9SVG+QZ4gQFfBZhdDYI31T65uzmVwU5cCX6Kr 5a9OqYpQt4i52TiBlF+bARx1JoylSYvbROENPXAyq9SOWzVBf3nofyNAx0JygG8nqLf4p+ h9PHlD1VImpIGDhJ1HmHqNKZwBUTsiG8GroytDy0S7q7JaWgtP0KMvbYJmF3/6uIToarUL s5yhOEOkYdngioZZ60SyhDeBJcVvoLAf26xBdEmPKHBjkDuqybcpLHon3WU0MuueeAyHxv hMcMjfmin60VE3r1Jncv/O8jqXgczajCCONiv6FYmfIxLXXjc82Itjbczt2ooQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727199055; a=rsa-sha256; cv=none; b=p27doA6TC8yWBQ9/QXpvjby7yVUibIGdXPrDVQaPngk2W+4Teu+6Dj/LC5Lz5x2N2c2XIp UjcdwuH986KKNj4EJdDmwTwgQ+fWWn/GluC+s9+DglitOzmREmfTSKJ3Y0Fjn5e7kzoWAJ F6TBhvq+IGiKOxvwMrT/m6OhM/wFOteoEaEEwycNqYyX0ytYRhv6je4csXir2LrhqZcfSt sUrvblVbKdtwqqsyw8M+Vg3OnRPcDAsb5taNmlmILY3Jqilb2dM6N1Wo0UGdpykMhVyd4j kbRNSW2QR4DFGgkO1plMAw2lNC/TxFfvT3YI2oIhJZXZjWrQCJowd2sa+OFwPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727199055; 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=d9SwjTV2rPKjXekxNr4yp+bDmYuVLBRaDlJZGdRlXPs=; b=YKWvK+Jt7zMIh3vB9gdY+d3ljyKlCT627pgXV81VwKYong/eHEDvBmrR8APYzpT1kN6ZQl Ig/so9+cBakVq10yYbCSv1cfQwsxRLs8nwWS2Cdaq+2YUw2nc4AdrS7VLoTOc+MH10XvKI IAPkxP7NPtjGVlMEX5mlHYMUckddv4dsa0ww8Bx5hXcwoTqCa2S+m2W7K2rxjFuDUAO8tf 2XKqKJADUyvOg3jlJ1LHOCszgtI0VOSkYZjFs2LGavM4de6YeuIz4PHlHo1ij8TwDHh8ZJ QJMv33RFqrZ/LK3mPNWXuQ3EuQtcAwPb72I1AHkxcgqlpxGaejR4SK76CwLqFQ== 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 4XCn2R1bzzzdcJ; Tue, 24 Sep 2024 17:30:55 +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 48OHUtGb021032; Tue, 24 Sep 2024 17:30:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48OHUtFe021029; Tue, 24 Sep 2024 17:30:55 GMT (envelope-from git) Date: Tue, 24 Sep 2024 17:30:55 GMT Message-Id: <202409241730.48OHUtFe021029@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: 6a645bb3535c - stable/14 - bhyve: validate corb->wp to avoid infinite loop 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a645bb3535cb73b1f20db652c9e3893f26a986e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6a645bb3535cb73b1f20db652c9e3893f26a986e commit 6a645bb3535cb73b1f20db652c9e3893f26a986e Author: Ed Maste AuthorDate: 2024-09-19 18:57:42 +0000 Commit: Ed Maste CommitDate: 2024-09-24 17:30:35 +0000 bhyve: validate corb->wp to avoid infinite loop Guests must set HDAC_CORBWP less than corb->size. Treat invalid values as an error rather than entering an infinite loop. Reported by: Synacktiv Reviewed by: markj Security: HYP-12 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46134 (cherry picked from commit a305f44d1404fbf386bb2b50ab7233ce9eabe0bb) --- usr.sbin/bhyve/pci_hda.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c index 6f0c1b6cfba9..58481af71a4c 100644 --- a/usr.sbin/bhyve/pci_hda.c +++ b/usr.sbin/bhyve/pci_hda.c @@ -789,6 +789,11 @@ hda_corb_run(struct hda_softc *sc) int err; corb->wp = hda_get_reg_by_offset(sc, HDAC_CORBWP); + if (corb->wp >= corb->size) { + DPRINTF("Invalid HDAC_CORBWP %u >= size %u", corb->wp, + corb->size); + return (-1); + } while (corb->rp != corb->wp && corb->run) { corb->rp++;