From nobody Tue Nov 12 07:55:42 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 4Xndy72BFFz5bf5t; Tue, 12 Nov 2024 07:55:43 +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 4Xndy70Bq0z4fFK; Tue, 12 Nov 2024 07:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731398143; 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=64/L+PL77L0hPLxcOLQ1QmQB/Uz3CS1ysETs7bvqin8=; b=O27HM3Ey1x3QiAK7N2eS6YziOvLDgTvyQPQLAGIT90NqD48b7ADPUTgL4zR44IFuM1+ok2 1hixbnYj8xIdWxu8JhpPKLP4eT+K/xn/GHDRm8mTkIuGmGOKWeHL4gfRyMgi11GTO0LIus QQWdn/7SKBs4JDZp/E12AYLIjU/5QiYMXVZoewy2EZbUMchrmmLCZbjPM3es1iXoLQAR0n laEd0s9IleWCnO8F1wnLs3gOmHN93Gfy7SMBbsCsDaUOD+lRq1CxSLizJLN5sYykkNEES1 crGnvTk5IInm6C7ATX63ja7r7kyI4P4kcZ38Da3oC3Is/NAFGRamN59hQ6LrFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731398143; 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=64/L+PL77L0hPLxcOLQ1QmQB/Uz3CS1ysETs7bvqin8=; b=jefxK3+0kr3EQXRbHlv44UM9ZWouq5izMFv0I/pbBgUeZxBvUEiVFxnKiFnK6PDOaQwW62 ASSUiKX8IFS8KE8r1qSjY5HBWDqQWQg/yOJxpWViZCyymx+dHsaB2V/OYnE7Cu6gOWZxRi GodCZ0h1XiOQmkhtp1WkWDK0zhLCdQXM7ZyzCKjf/mJsmAPY6EeTH7Wv2TrBkVzEHKtP4b U2YcbeRiRLGYu+Ff4Ogr8S+q4uKY/vdTzOyeEoCy14GlCYhvQxajba3UiXS1LfElKLeX8J UGvdGITjI1QhC+QiafucoRlafrWavCBP/BJCoIpCTrBo7ZzgyxiVHIS0cQH5DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731398143; a=rsa-sha256; cv=none; b=D+PB53wu09eqNY91jqwDiadB9UA8Wd9U6qolKAG8bBSPXRoS7/G/7G5aDMUWuIkoFx5QL8 EXlik3dV4tGgyrK4RQGo//RyCfEOJDiI2waYQteRLC3Gdiy8vYGCSpff4PmOhIhGfiFNWt eQ/EtYl+TYAW6lfhXJz06j4YLMnUpm2RH6ciN0ugTzvtDF2UL6geAaMQqBL7tcharWYSZy 6JE+NiahC9glqNOLazs/oSIsEAV2+kjNyC3h/P8lRC0Ziv4GuFqdliK3c+yuFYhbYeOS+k jWCVpBIjtLnpnHexJmPVOKWD8wKVv570bFQzn6U5hJ1/5QnK9DZ0OUcwRpu/ZA== 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 4Xndy66sQnz12TG; Tue, 12 Nov 2024 07:55:42 +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 4AC7tgFS077096; Tue, 12 Nov 2024 07:55:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AC7tgfT077093; Tue, 12 Nov 2024 07:55:42 GMT (envelope-from git) Date: Tue, 12 Nov 2024 07:55:42 GMT Message-Id: <202411120755.4AC7tgfT077093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 5a43d257c0fe - stable/14 - bhyve: don't crash when guest writes TPM int_enable register 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a43d257c0fe009235c11463ace889aaef3d0c8e Auto-Submitted: auto-generated The branch stable/14 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=5a43d257c0fe009235c11463ace889aaef3d0c8e commit 5a43d257c0fe009235c11463ace889aaef3d0c8e Author: Hans Rosenfeld AuthorDate: 2024-09-09 08:41:31 +0000 Commit: Corvin Köhne CommitDate: 2024-11-12 07:54:22 +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 (cherry picked from commit 2feea221b2480f9f97b3bc0f47510b5bdec96b79) --- 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 95cd8b1aae31..3e0769d1fef6 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -338,6 +338,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;