From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795016262; b=5AAf6L6/ZO8Gs2Fc9Ll7qzKlFHFzLYacpvIk8OG6/siwnrm+788f6ZzXq03x6sneMw3s DFYWASz6ggWGID5RN4436ibS6KXaLgR5MmRnoWZ+S6620IXT0rUTPQ5kraIZ3L8q/D5Qi NtpHy3x10I7neaQ9qgQRDGAwsMM30VkLxOf4QA1dBJYx5IYjQ8NW9JQ7+n5fWeaCOxnjM N6A1AK2UikW1OxVdL4v+O2M6IyyCMKTva0EIRQWRriGbXec783klc4CVrFn07CbTcpKPZ DgCKsW3LrCl7CQzZckum6Y4+08Kw6pKHFQ7X/kBi3Dwk0FEPX/z87UtK8B9Vt4e+DaA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795016262; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=sLgbkVMbORcXpIoS7EVhZYViQGSfbhU6X0a4ivKpDms=; b=TlkeIDJ2wRL71JILyYsZVoZabQApglYnaM62r6gOBO2hqTEMRaWUWmA087AsNwTTZU4s sY3g9xjL+YjkEtz7DZC1zZzF8pnuz8F8kd5WNgwc1xFi8TfGR3WFcirnz6ZEmstR5vAsA vxAuQdmjeKa1T4VQycTvEcltIEoKB1HQOlWgt8WkAhdJFDHE3Q8NgD7NTmtVE9/B6pMh0 Z/qejo3SaubotnQg1JklYrRHS5ubZgRnZbZS6hU83YsjY4U1DtNzopWI2lA3I2Kx0cZM/ TtZCRYYpy4fv2OP7JhAMVVwiWpCQPm3eO9wxpXA5J+oJGX0BHt9j6IiFCKxto/blhWw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NmCXU1pt; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7CD8606A32A; Wed, 18 Nov 2026 15:37:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NmCXU1pt Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40EAE1F00926; Wed, 18 Nov 2026 15:37:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795016261; bh=sLgbkVMbORcXpIoS7EVhZYViQGSfbhU6X0a4ivKpDms=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NmCXU1ptFZB/hsa9pH/TEbnk0CEmfsuAnuz31EYmZDNJiOoC3HStt3EAVlrdDTc20 AHfgsmDxG1gQ2V6gUyoVS9mGJy4/9ZF123yvC3HoURpoZVxpyaswfia5yv93Z2ag+4 Jf++PW4YlV0+SVuinXzBKsYTiyGNAm3ukK32M3Ow= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chaithanya Lagisetty , Sean Christopherson , Sasha Levin Subject: [PATCH 7.3 0429/2651] x86/svm: Avoid sign extension of SVM_EVTINJ_VALID in 64-bit expressions Date: Wed, 18 Nov 2026 15:27:49 +0100 Message-ID: <20261118150303.270693792@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150247.972732815@linuxfoundation.org> References: <20261118150247.972732815@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chaithanya Lagisetty [ Upstream commit c5991239b148d40d4981901968b3a6a838ff517b ] SVM_EVTINJ_VALID is defined as (1 << 31), i.e. as an int with the sign bit set. Whenever it is used in a 64-bit expression the int is sign extended, so bits 63:32 end up set as well. Two 64-bit users are affected. verify_exception_info() uses the macro as a mask against a 64-bit value when it sanity checks hypervisor supplied exception information: u64 info = ghcb->save.sw_exit_info_2; ... if ((info & SVM_EVTINJ_VALID) && The mask is 0xffffffff80000000, so the check also passes when any bit of the error code in 63:32 is set while the valid bit itself is clear. svm_vmgexit_inject_exception() builds the value that KVM hands to an SEV-ES guest in GHCB SW_EXITINFO2: u64 data = SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_EXEPT | vector; For vector == X86_TRAP_GP this yields 0xffffffff8000030d instead of 0x000000008000030d. The field uses the EVENTINJ format, which holds the error code in bits 63:32, so KVM asks the guest to inject #GP with an error code of 0xffffffff. Linux guests only consume the error code when SVM_EVTINJ_VALID_ERR is set, which it is not here, so they are not affected in practice, but the value KVM writes is not the one it intends. Use BIT() instead, as is already done for most single bit definitions in this header. Every other user applies the macro to a u32, where the resulting bits are unchanged. Opportunistically give SVM_EVTINJ_VALID_ERR the same treatment, there's zero reason to open code BIT(). Fixes: 597cfe48212a ("x86/boot/compressed/64: Setup a GHCB-based VC Exception handler") Fixes: c3392d0ab714 ("KVM: SVM: Provide helpers to set the error code") Signed-off-by: Chaithanya Lagisetty Link: https://patch.msgid.link/20260908053722.3917934-1-nagachaithanya9911@gmail.com [sean: use BIT() for SVM_EVTINJ_VALID_ERR as well] Signed-off-by: Sean Christopherson Signed-off-by: Sasha Levin --- arch/x86/include/asm/svm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index aa63431ba92c3..e883241b5e1eb 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -637,8 +637,8 @@ static inline void __unused_size_checks(void) #define SVM_EVTINJ_TYPE_EXEPT (3 << SVM_EVTINJ_TYPE_SHIFT) #define SVM_EVTINJ_TYPE_SOFT (4 << SVM_EVTINJ_TYPE_SHIFT) -#define SVM_EVTINJ_VALID (1 << 31) -#define SVM_EVTINJ_VALID_ERR (1 << 11) +#define SVM_EVTINJ_VALID BIT(31) +#define SVM_EVTINJ_VALID_ERR BIT(11) #define SVM_EVTINJ_RESERVED_BITS ~(SVM_EVTINJ_VEC_MASK | SVM_EVTINJ_TYPE_MASK | \ SVM_EVTINJ_VALID_ERR | SVM_EVTINJ_VALID) -- 2.53.0