From nobody Fri Jan 20 17:59:16 2023 X-Original-To: dev-commits-src-main@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 4Nz6h43BMWz2t8YZ; Fri, 20 Jan 2023 17:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nz6h42kGqz4LF4; Fri, 20 Jan 2023 17:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674237556; 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=ygPwe9XvrQTc6yeUmLb/rcOQ5W+aO50Cj+5WSHnPesk=; b=oWbM+G0PxmoBbvgarTH5A/04+InkDtHM81y0UuuXodYqt6n1LzNLx8kral55hc6HNm6E5n 0pAIxOygSUS6T9G+wmjP4RstUKjPVKEgB4mIG/4Yu7fRT7P71E/O+OnhoDmcyTAMCb1J7P /0+jls2gFB6THP6kj7KSHVT6PfOIcbWCGskzh8cScFY05YRUwLylgXAnxFCfMHLpewhggm tG1NENBgmjbkZRl2kUl8FTXgM0pxO90nWGw4mytCyDTKiDq17/SsmM1YEMpYQmC6YbZJgK 57kC9rivhh+NHNW1j9uu7SM1Qs6CZMDhNbBzwWlfSnbPEfw2VJNIcGm7tQ2QaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674237556; 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=ygPwe9XvrQTc6yeUmLb/rcOQ5W+aO50Cj+5WSHnPesk=; b=GT3h35pNMtviEigjrQfoKa0F61kcXeJYN0684UDhYxxX+dwJC/RJtO8Q+7F1T5bnFP5O80 JYYpE7wQ/YcesRT0X6AO+Pst1vojmun1nyI+QI61FyqZbzRSDhHWkyBC1XczlwDwKxKPiO pQKBbZOgGYjefNbSLaCZmbzl/Xdn8qMPUVFTVuF+ELOqsKx7UadcB6iFg/rhZ05vuUCrb9 rxviqqNyYG6ICLdkrVhS2XVz7SRhjDOkWq092N09iCMogIgZxq9l6v00zzp7Ak+SAAyxVl hHo23HHwvAyyvMF9C+jyPHgBJPNOcSpYAzE9sjz9q1AA5JyuKg+k27rvu4vIlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674237556; a=rsa-sha256; cv=none; b=PnUEZpu2r5n6rudU31V717HE0wHPBncsYmYA+lBvg5EOhHLc6ShDfG6edHZiWKuOpBuvLd 1LA94tHyaynNKI1rY250vGdJG4fGmqI1IBzDdEPsew+aKiSCw7yJtBGyqQVHV1KMinvOki by+KpgI5Ibis34odvlthdqrxwEoV25XQfmAyBV09sN2oWmxG/0FpEP/Ru/HRgVFODBEFUW 1d2PQZQNLS6Sb9yl3lwLgXIhfwnIRBj7iajyHr2VgTiOq+Qrh71OEAdpX4CL4J2O4cMgz6 XBVxhAdQlNlyqHFLcVSRRX1YpMX4daRpyR9/WSD2w/fQt6aoJpz4Qc/bl44AtA== 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 4Nz6h41n1rzfc4; Fri, 20 Jan 2023 17:59:16 +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 30KHxGsv084697; Fri, 20 Jan 2023 17:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KHxGD9084696; Fri, 20 Jan 2023 17:59:16 GMT (envelope-from git) Date: Fri, 20 Jan 2023 17:59:16 GMT Message-Id: <202301201759.30KHxGD9084696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: cf57f20edcf9 - main - bhyve: Fix a buffer overread in the PCI hda device model. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cf57f20edcf9c75f0f9f1ac1c44729184970b9d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cf57f20edcf9c75f0f9f1ac1c44729184970b9d9 commit cf57f20edcf9c75f0f9f1ac1c44729184970b9d9 Author: John Baldwin AuthorDate: 2023-01-20 17:58:38 +0000 Commit: John Baldwin CommitDate: 2023-01-20 17:58:38 +0000 bhyve: Fix a buffer overread in the PCI hda device model. The sc->codecs array contains HDA_CODEC_MAX (15) entries. The guest-supplied cad field in the verb provided to hda_send_command is a 4-bit field that was used as an index into sc->codecs without any bounds checking. The highest value (15) would overflow the array. Other uses of sc->codecs in the device model used sc->codecs_no to determine which array indices have been initialized, so use a similar check to reject requests for uninitialized or invalid cad indices in hda_send_command. PR: 264582 Reported by: Robert Morris Reviewed by: corvink, markj, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38128 --- usr.sbin/bhyve/pci_hda.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c index bb8fba1a54bb..9e9d7ab5a626 100644 --- a/usr.sbin/bhyve/pci_hda.c +++ b/usr.sbin/bhyve/pci_hda.c @@ -475,12 +475,14 @@ hda_send_command(struct hda_softc *sc, uint32_t verb) struct hda_codec_class *codec = NULL; uint8_t cad = (verb >> HDA_CMD_CAD_SHIFT) & 0x0f; - hci = sc->codecs[cad]; - if (!hci) + if (cad >= sc->codecs_no) return (-1); DPRINTF("cad: 0x%x verb: 0x%x", cad, verb); + hci = sc->codecs[cad]; + assert(hci); + codec = hci->codec; assert(codec);