From nobody Sun Jun 14 00:15:00 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CD3C3CF692 for ; Tue, 5 May 2026 07:08:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777964900; cv=none; b=hXl7anQUCykcSgtO/lqzbMALV0i6T71ypCFGFP0AWO3oaLWAqmStrj7OOw/B0+z5ND0z6jtADPzkT6KJkZ8k51SFTNcbhGaGuvF6iiHjML6G5j9vxZWPCdwKVZwtstz5Ya9pUxcu+/kYiVdyHwBOZuR/YTeFbcsJv59kR4W1HVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777964900; c=relaxed/simple; bh=rhuOD+E0HK6vTZxQh0nNo79jGVBrQZSoJ92HTBng/ng=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=PDvYuPLG98a++lykwnLGLOpkEvY1z0HeEO4XrQYCtCdsukcYczBxGi/dTsX+nLCLVJ4P0O8hsEfyqnova2q/f2mwOCjpGXACjijGLGJH9DrYkbjwkY9EYebwICMHtLSZEZz14qNqJN7qd3JQ3aKcupwHn7WSRCKpZ3/2nIvoszY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=O/52p5k0; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=f1uSc6Ap; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="O/52p5k0"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="f1uSc6Ap" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777964897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yeVY9MkCXy7pdk8snaK66JA60FQ3IkREAluPMekcUpg=; b=O/52p5k0Vtlxs7VD9tAM7H+LQw2f1O7+dlkjhLrgtehbqgAony9ymSodirfzh+oPfJFnfo TebGzOHpGpj8WKRZeUlf2o8M3IEMr7M8Y54nF8HMaTzUGj16iNW9YyrMZ1sV5vSQ5GozYS uUojiEdVMcqFk6HysnChFTpm3udvqRc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-GegJ5itgNt6c0YOXAW5Naw-1; Tue, 05 May 2026 03:08:16 -0400 X-MC-Unique: GegJ5itgNt6c0YOXAW5Naw-1 X-Mimecast-MFC-AGG-ID: GegJ5itgNt6c0YOXAW5Naw_1777964895 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-48a55ecc32cso45387465e9.1 for ; Tue, 05 May 2026 00:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1777964895; x=1778569695; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=yeVY9MkCXy7pdk8snaK66JA60FQ3IkREAluPMekcUpg=; b=f1uSc6ApYTfTS2N8kd5yktmAYgc2JO4rp5zErfxh50Rw586pcVVMsjlCsjayMsM89X I6sKRs5dljWNnNIuZOmgaRhqNyThTazdfqilnnG9ghZBr3lzvyZ3v3B22oSvK/x3GNzz D86pUeKYnqUB3+HI8mk4hAhAQG5OKxg6Bqvi/aIlA+ofXjT3aUDAU1OmqpFZZ+l1WOej +qjae1WyMyCw13iiKHO//iJwEEA0WiT5J2wpA6d9VKVCRS748cIfPoQMsR9Uw7SHuJvs 3Ogg2nOYjKJ8rwXAlCaFPqOJdyOjmuZu0SXCcGikE79/jLRskRfM7KSITy2ROv8vL86m 9psw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777964895; x=1778569695; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yeVY9MkCXy7pdk8snaK66JA60FQ3IkREAluPMekcUpg=; b=J/ucW0UvJabj81+4/paFRrrhB/6rfUHMGrQAl/99FxA3JIjCCGEILrVPz0Nhn8+gx6 lyuEY+VWJhMRTYq4OHtYsLu/wEYPBMgEY1sPHYGi8ymyb4weZhdThbz20C7r7Z1pxfiA dRzBM6MlDX6P+fr2KVPkhSVrZVn7ibSJPkZGU5lwBfCze9i+PfNTq8thWPq2uKfuPH97 wr8nV4ngwZLWZXEf7+bXT1wjrEgg8KPnVNDcP+vAZfg+9pTf8j7FREjL7pPfTeh3bo12 3WpvX4G+dY6x8/bBtcrbtHlkrezCga9c4QmS12iiwJKbtbTvgNIU6x3nX9CYH0EnG/0x VKGw== X-Gm-Message-State: AOJu0Yz7tCur1KALv5bZcyupNXt50nXP+BYPwp4T4ouj706+NshBjcLo wqCgYTeSuuO+M+Y2Ce3sBy9zQVMvl6SMWaNj8JB8p58hz7Dk2DVp8qFBQeUFyq8kLRMR8WaX8ra MhovzX4APZkiyf6s4+FKq4I8xHnWaO44cNq/+VJ3NRcj0H311RejzaFvUCwPGNGPJSm23QdCXhA HAcOjbRpbeKLWTjty6FlWdC9OqZqUy6ibtpWr5bSvhR383tB34SA== X-Gm-Gg: AeBDieuxUXKIdjTGDpyZHqRtIU3DTPeGNc+w06N3WgSxqyy1vjpLQHS6G0cqi1VqVx7 aIxIjWYmbL6fY2j07fI/8e+GQ6hyNWzWwCul4D9y+N1cl7w2nCDsb6ThyGjUtzQdRKnhnbcbUMm 5qs5YbqWEEJSVdYMxgaUZLrC5mZ1ROwJVDNRPJcE5rfqHmVAODYy4/VniGlFzqrtzGAIXw1JQqZ io/AxAmxLkLfDTaxqw4NNmg/v4QpSf91pXfA3ae9fmDTTyPMIbhBt/KUon6cw3UFKURiakhPLIA ORafhmqjG8i2eTw16RIHsUL21cApdDadyKtKDQRz8dGPFKX3BOzqxJyrxq5O7LzZsGVt0aHcwpM s/E+KC7lWx1K+1VwqAGB8Lt6VrMFy+PQnMHgMaSUAecKzNbbfsY/e7gfL24+PXztWOZ4U4GsjsG +9Qol14SoJc8i8hu+fOt82KRHw4BZgbQa4CD9/OKg= X-Received: by 2002:a05:600c:c174:b0:48d:1a94:56c with SMTP id 5b1f17b1804b1-48d1a94087dmr23654355e9.18.1777964894871; Tue, 05 May 2026 00:08:14 -0700 (PDT) X-Received: by 2002:a05:600c:c174:b0:48d:1a94:56c with SMTP id 5b1f17b1804b1-48d1a94087dmr23653635e9.18.1777964894335; Tue, 05 May 2026 00:08:14 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055e2d3d0sm2136470f8f.34.2026.05.05.00.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 00:08:13 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Sean Christopherson , Alexander Bulekov , Fred Griffoul , stable@vger.kernel.org Subject: [PATCH 6.1.y] KVM: x86: Fix shadow paging use-after-free due to unexpected GFN Date: Tue, 5 May 2026 09:08:12 +0200 Message-ID: <20260505070812.221568-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Sean Christopherson commit 0cb2af2ea66ad8ff195c156ea690f11216285bdf upstream. The shadow MMU computes GFNs for direct shadow pages using sp->gfn plus the SPTE index. This assumption breaks for shadow paging if the guest page tables are modified between VM entries (similar to commit aad885e77496, "KVM: x86/mmu: Drop/zap existing present SPTE even when creating an MMIO SPTE", 2026-03-27). The flow is as follows: - a PDE is installed for a 2MB mapping, and a page in that area is accessed. KVM creates a kvm_mmu_page consisting of 512 4KB pages; the kvm_mmu_page is marked by FNAME(fetch) as direct-mapped because the guest's mapping is a huge page (and thus contiguous). - the PDE mapping is changed from outside the guest. - the guest accesses another page in the same 2MB area. KVM installs a new leaf SPTE and rmap entry; the SPTE uses the "correct" GFN (i.e. based on the new mapping, as changed in the previous step) but that GFN is outside of the [sp->gfn, sp->gfn + 511] range; therefore the rmap entry cannot be found and removed when the kvm_mmu_page is zapped. - the memslot that covers the first 2MB mapping is deleted, and the kvm_mmu_page for the now-invalid GPA is zapped. However, rmap_remove() only looks at the [sp->gfn, sp->gfn + 511] range established in step 1, and fails to find the rmap entry that was recorded by step 3. - any operation that causes an rmap walk for the same page accessed by step 3 then walks a stale rmap and dereferences a freed kvm_mmu_page. This includes dirty logging or MMU notifier invalidations (e.g., from MADV_DONTNEED). The underlying issue is that KVM's walking of shadow PTEs assumes that if a SPTE is present when KVM wants to install a non-leaf SPTE, then the existing kvm_mmu_page must be for the correct gfn. Because the only way for the gfn to be wrong is if KVM messed up and failed to zap a SPTE... which shouldn't happen, but *actually* only happens in response to a guest write. That bug dates back literally forever, as even the first version of KVM assumes that the GFN matches and walks into the "wrong" shadow page. However, that was only an imprecision until 2032a93d66fa ("KVM: MMU: Don't allocate gfns page for direct mmu pages") came along. Fix it by checking for a target gfn mismatch and zapping the existing SPTE. That way the old SP and rmap entries are gone, KVM installs the rmap in the right location, and everyone is happy. Fixes: 2032a93d66fa ("KVM: MMU: Don't allocate gfns page for direct mmu pag= es") Fixes: 6aa8b732ca01 ("kvm: userspace interface") Reported-by: Alexander Bulekov Reported-by: Fred Griffoul Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson Link: https://patch.msgid.link/20260503201029.106481-1-pbonzini@redhat.com/ Signed-off-by: Paolo Bonzini --- arch/x86/kvm/mmu/mmu.c | 36 ++++++++++++++---------------------- arch/x86/kvm/mmu/spte.h | 5 +++++ 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index ed5ba38bec86..58d67e5ab2c5 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -163,6 +163,8 @@ struct kmem_cache *mmu_page_header_cache; static struct percpu_counter kvm_total_used_mmu_pages; =20 static void mmu_spte_set(u64 *sptep, u64 spte); +static int mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp, + u64 *spte, struct list_head *invalid_list); =20 struct kvm_mmu_role_regs { const unsigned long cr0; @@ -1156,20 +1158,6 @@ static void drop_spte(struct kvm *kvm, u64 *sptep) rmap_remove(kvm, sptep); } =20 -static void drop_large_spte(struct kvm *kvm, u64 *sptep, bool flush) -{ - struct kvm_mmu_page *sp; - - sp =3D sptep_to_sp(sptep); - WARN_ON(sp->role.level =3D=3D PG_LEVEL_4K); - - drop_spte(kvm, sptep); - - if (flush) - kvm_flush_remote_tlbs_with_address(kvm, sp->gfn, - KVM_PAGES_PER_HPAGE(sp->role.level)); -} - /* * Write-protect on the specified @sptep, @pt_protect indicates whether * spte write-protection is caused by protecting shadow page table. @@ -2253,7 +2241,8 @@ static struct kvm_mmu_page *kvm_mmu_get_child_sp(stru= ct kvm_vcpu *vcpu, { union kvm_mmu_page_role role; =20 - if (is_shadow_present_pte(*sptep) && !is_large_pte(*sptep)) + if (is_shadow_present_pte(*sptep) && !is_large_pte(*sptep) && + spte_to_child_sp(*sptep) && spte_to_child_sp(*sptep)->gfn =3D=3D gfn) return ERR_PTR(-EEXIST); =20 role =3D kvm_mmu_child_role(sptep, direct, access); @@ -2331,13 +2320,16 @@ static void __link_shadow_page(struct kvm *kvm, =20 BUILD_BUG_ON(VMX_EPT_WRITABLE_MASK !=3D PT_WRITABLE_MASK); =20 - /* - * If an SPTE is present already, it must be a leaf and therefore - * a large one. Drop it, and flush the TLB if needed, before - * installing sp. - */ - if (is_shadow_present_pte(*sptep)) - drop_large_spte(kvm, sptep, flush); + if (is_shadow_present_pte(*sptep)) { + struct kvm_mmu_page *parent_sp; + LIST_HEAD(invalid_list); + + parent_sp =3D sptep_to_sp(sptep); + WARN_ON_ONCE(parent_sp->role.level =3D=3D PG_LEVEL_4K); + + mmu_page_zap_pte(kvm, parent_sp, sptep, &invalid_list); + kvm_mmu_remote_flush_or_zap(kvm, &invalid_list, true); + } =20 spte =3D make_nonleaf_spte(sp->spt, sp_ad_disabled(sp)); =20 diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h index 7670c13ce251..0ed97eb1c2e6 100644 --- a/arch/x86/kvm/mmu/spte.h +++ b/arch/x86/kvm/mmu/spte.h @@ -295,6 +295,11 @@ static inline bool is_executable_pte(u64 spte) return (spte & (shadow_x_mask | shadow_nx_mask)) =3D=3D shadow_x_mask; } =20 +static inline struct kvm_mmu_page *spte_to_child_sp(u64 spte) +{ + return to_shadow_page(spte & SPTE_BASE_ADDR_MASK); +} + static inline kvm_pfn_t spte_to_pfn(u64 pte) { return (pte & SPTE_BASE_ADDR_MASK) >> PAGE_SHIFT; --=20 2.54.0