From nobody Tue Oct 22 12:06:48 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 4XXrWY11qFz5FDnx; Tue, 22 Oct 2024 12:06:49 +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 4XXrWY0N1mz4qj6; Tue, 22 Oct 2024 12:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729598809; 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=8CQFu27ZnWv6Q0Mi6p/snRyDSzwpmP9edJmljM07Rhc=; b=rkLO9bTi4mZ5Snl75S9RbTaefuxU03rjFaTeCNMyZq85/og3Xs+k/fsw7l/V/b0x/LP0DM oUzY8WJAVszD6JMsT+5y228l57OXLoc2q4JjmDpSGBJzofpvkk8dKCIPq6EPN8mvEx5k5I yqK2FMKHzHkMbNV/IsciBzG6z43R7jNJYSJmktXJQu/dWGAR5lkXcyGTsFW3KUa8ECMeYK kC9bl0DEdzAxx5SAfMKu/EW8RV6w73Ol6jx5tkhZ7UjxuOz5FVg+nm5b/59tABfvPiX5GB 50G3C3WcvFrD1ENEMJ5WBMzI6XMOYG4kfCO/gApktGuC5UOhYyi2/CRU+RNOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729598809; 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=8CQFu27ZnWv6Q0Mi6p/snRyDSzwpmP9edJmljM07Rhc=; b=T/J4r/Z1bxcQnQeHVlDQPbcXn9Y3mTpCoFxyzBMtsoekT3EE9c39oxmrYBHyCDHP9Wj8rm RJ/L9H1u9DS+mIUdTZ2TV1m8wMBVM7fFTIjRSlKJ+/AePiI4sVAvzlxNnoKnnop4399VSi FmlElzFUM8bE/y9knu6mnLq5znt4s1kEAVTOtPUm0lC2yfUuWieXrFu0k9iaYQUvjVxHAe gX5R/mfGprRr6VAj5/AoS0P7vg9yPSCF5SkLPLeQI2Bml2xB2ZXsk875E29CIdg8aOa8O+ MVG47ldazrRBqNwd2mrKlRGTOrzaiut089gr+25ui2rESDHlWSQ/rQvw6pT0Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729598809; a=rsa-sha256; cv=none; b=ZW4LTyjzGod6fIfkmI4pm21NXoADoQesezJOhlB2mcm3ZryM9xw6wAbYhcEPVkl+SZL5Wz GTwh6sKvLO3uFV2PT013Ieckc4Gj0vYC/ZmaUSsDz9Y9juAO0rkU54YkI2b9VhEY1Tz436 qiiXX+WzgvjU6vUUd02L9NH89mY9ExLtjkoKjM472V0/0YSTEIHG0/b1vqTgoNVWFPbHrG ST32P49nQ5ujdyYa0eot9jKEX4RIXnbs9llRTzFJFhIrB/yw7RMYEg9Euxuuib01pUkTo4 akysC/ZZ8Jo9520cxLe7AZf6GI8dFVsOqznw+3VwwyBQTo/A7T4pVeapntTZLA== 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 4XXrWX753Nz1ChT; Tue, 22 Oct 2024 12:06:48 +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 49MC6m08085172; Tue, 22 Oct 2024 12:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MC6mvD085170; Tue, 22 Oct 2024 12:06:48 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:06:48 GMT Message-Id: <202410221206.49MC6mvD085170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 2feea221b248 - main - bhyve: don't crash when guest writes TPM int_enable register 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2feea221b2480f9f97b3bc0f47510b5bdec96b79 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=2feea221b2480f9f97b3bc0f47510b5bdec96b79 commit 2feea221b2480f9f97b3bc0f47510b5bdec96b79 Author: Hans Rosenfeld AuthorDate: 2024-09-09 08:41:31 +0000 Commit: Corvin Köhne CommitDate: 2024-10-22 12:04:21 +0000 bhyve: don't crash when guest writes TPM int_enable register FreeBSD's own TPM driver writes 0 to the INT_ENABLE register during attach, making sure interrupts are off. bhyve really shouldn't kill the VM when that happens just because it doesn't support TPM interrupts. Even if a guest was trying to enable interrupts, we should just ignore it like real TPM hardware would. Reviewed by: corvink MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46562 --- usr.sbin/bhyve/tpm_intf_crb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c index 0f9a8d1dd53b..d4ac2b47d28a 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -337,6 +337,10 @@ tpm_crb_mem_handler(struct vcpu *vcpu __unused, const int dir, break; } + case offsetof(struct tpm_crb_regs, int_enable): + /* No interrupt support. Ignore writes to int_enable. */ + break; + case offsetof(struct tpm_crb_regs, ctrl_start): { union tpm_crb_reg_ctrl_start start;