Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 85EC1C4453E for ; Wed, 22 Jul 2026 12:06:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wmVhN-0005pG-L2; Wed, 22 Jul 2026 08:05:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wmVhK-0005oX-QG for qemu-devel@nongnu.org; Wed, 22 Jul 2026 08:05:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wmVhI-0004FO-CK for qemu-devel@nongnu.org; Wed, 22 Jul 2026 08:05:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784721910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXzOszz6KSfOvpcQSu0jqwTTH5w9E3i3/Q0a4AONinE=; b=cGGbt49tbTe3DGGKSdoTZRt2AbwN4rtWIAXsp4UXVqWDiSqQsCoxckaxKTE52U3RhsZEbG mgzse+vmFw5vD9ZtkMdiqnCJ14gUoYcp2Ak174weOPvAM1ALM376TUFeirXNTSHga+vmR9 0Ous/slruwL6BkMpMdjT5M3lSu+1oD4= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-208-Kl2729egNIOkuj4obT80aw-1; Wed, 22 Jul 2026 08:05:09 -0400 X-MC-Unique: Kl2729egNIOkuj4obT80aw-1 X-Mimecast-MFC-AGG-ID: Kl2729egNIOkuj4obT80aw_1784721908 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 16A8A1809CB4 for ; Wed, 22 Jul 2026 12:04:46 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.48.82]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 69E7A180056E; Wed, 22 Jul 2026 12:04:44 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Marcelo Tosatti , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH] target/i386/kvm: Fix UBSAN shift error in MTRR mask computation Date: Wed, 22 Jul 2026 14:04:37 +0200 Message-ID: <20260722120437.697986-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: permerror client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On AMD EPYC processors, raw CPUID leaf 0x80000008 reports 52 physical address bits. When a machine type such as microvm forces host_phys_bits=true, the CPU ends up with phys_bits=52, causing MAKE_64BIT_MASK(52, 0) to shift by 64 — which is undefined behavior. Fix by only computing the mask when phys_bits < 52. Fixes: fcc35e7ccaed ("target-i386: Fill high bits of mtrr mask") Signed-off-by: Cédric Le Goater --- target/i386/kvm/kvm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 4272b6770c7c9e3907a8f4de2c3234378f16482e..6dd314c90748e49b1ff27933b208dc552dd58906 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -5064,8 +5064,7 @@ static int kvm_get_msrs(X86CPU *cpu) * we're migrating to. */ - if (cpu->fill_mtrr_mask) { - assert(cpu->phys_bits <= 52); + if (cpu->fill_mtrr_mask && cpu->phys_bits < 52) { mtrr_top_bits = MAKE_64BIT_MASK(cpu->phys_bits, 52 - cpu->phys_bits); } else { mtrr_top_bits = 0; -- 2.55.0