From nobody Tue Oct 29 18:49:53 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 4XdK7P49jhz5bmvP; Tue, 29 Oct 2024 18:49:53 +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 4XdK7P2F1xz43ky; Tue, 29 Oct 2024 18:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730227793; 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=OqEuZqjjOxLba3rt62WmQKFPDQkvGzt9yeo7UlUales=; b=lWxh2QkA0VuNDWz5UrQLxVWs2rVWyZyl3VzcBQDJtiVf7REki7zzjiYTkbnaKEgcJQUe59 wmy3o6CJm6KjcpxL73vpL72ce0WLYQ/7xjzMP4gjsXQq7TnyyqyrIeCXaxISL354/bUTDJ EBv2rE8Te3pzLK4iRbYYaUjvtv0bYkiPmPRNth4H7oYWDtbyh4Wz1pWgYQYBtmDj32Un60 LJEdeB1Q70fJqTjLCPKqWvvysU/EoAOtf/FSfz0Bm6FJIrOli4O0BKUL+5H4QduoORXmnM OydJIetXfnT1c0zTqPtgjNwHNyO375jxHuFLGb/oaipHPQm1f7t3SDWwzSIw7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730227793; 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=OqEuZqjjOxLba3rt62WmQKFPDQkvGzt9yeo7UlUales=; b=ddML6SFi0PqvyXjs9ZwuBXQIF4UbLu2mkO56d5YSp4mNft7os0kSomwujQQisiM6nZy91d ah2Afc7JE4HXMdafrGgFrMLiOvB/dHyr/3oYoyM5xkCcUMJWB+WfGUfsEc48H0gWKtFhrp 5nosVoWzamBNFblWJTLLAvE19MZcw+dJmVK7K/aW95pBWd8Nc4FXzbNeXth5UvaHwkT8zt mSt08UJ9vZMXinQQ2fS3DSTx3hrlF/9fRBtcN46P5Mvxbs4sXDi/ojoA6b3pJ2B3vVwrew kvR8qHzdr6lkWkhs1sp3ty+XaEVoFx5MbqQKzAPt4J7R8AYUAv26nEnjICgKBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730227793; a=rsa-sha256; cv=none; b=EZu8RnuQgiMOlYwhCZlB/OpLM54Dnf0Pja/Z90warXhWmanBf/OW/qHVYmsPFoqF2g4rHH apeMODBB6qK/Qjxpt1qasLsRpRGneBxlqC1WioixewAXV0OG3PFhqEEW7h31szHAX4y7Mn zD3IEEJBnrWjOJXQyRLnw7d3irZZ75PN9E5pUwklJ8UYOrHul+Cp5iT7IFNWSFIi8Cue+J b/3q5FFfOPEy5qXymkkDMkWgaKfgcCX4BIegdnVss3yGaW65hYOwgbO+RuEYQNlYJr923N Wa1CHH6AmwAPUw3cnHqOfYjNEBhW4FztZanalqkWyd377QANq9gFofRFjQVrYA== 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 4XdK7P1fmXzZwM; Tue, 29 Oct 2024 18:49:53 +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 49TInrBV018605; Tue, 29 Oct 2024 18:49:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TInrCN018602; Tue, 29 Oct 2024 18:49:53 GMT (envelope-from git) Date: Tue, 29 Oct 2024 18:49:53 GMT Message-Id: <202410291849.49TInrCN018602@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: 798030a4e8d0 - releng/13.4 - bhyve: validate corb->wp to avoid infinite loop 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/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 798030a4e8d05da9f190531bff675a713c762372 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=798030a4e8d05da9f190531bff675a713c762372 commit 798030a4e8d05da9f190531bff675a713c762372 Author: Ed Maste AuthorDate: 2024-09-19 18:57:42 +0000 Commit: Ed Maste CommitDate: 2024-10-29 18:46:54 +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 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/D46134 (cherry picked from commit a305f44d1404fbf386bb2b50ab7233ce9eabe0bb) (cherry picked from commit 6a645bb3535cb73b1f20db652c9e3893f26a986e) (cherry picked from commit 867aaad5c2bfdd8326fc805964e711ccfbb18d1e) --- 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 7d824d7a1fd8..fd47abebaa42 100644 --- a/usr.sbin/bhyve/pci_hda.c +++ b/usr.sbin/bhyve/pci_hda.c @@ -787,6 +787,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++;