From nobody Sun Jun 14 00:15:26 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 57F783D567B for ; Tue, 5 May 2026 07:01:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777964468; cv=none; b=bXCRamtinEt0X3X3A7QBEGq1KiV8LsKSqj8kXfWNCl5VbKV1i2r5yBT6jRj3sKn8rEWdmcPLRdi/id7TP9N3kCqxrrVWPT5XNeKJ7pxaqAFWpu+9U6eBg1G2TFxuRNurG4bf4Ha/xqJ58tqZCY9/+hEKJ10/xYhP/th+24RHxnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777964468; c=relaxed/simple; bh=3LvJ5/xV1RQZaGHxF6pNpvvDu+FnGFMU5F1qw0qXnjo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=cGoSjBrYRH+315/qdPVgouY2OWZSWDqAuAl6vN2qy3P4zP5bOajjhamcdhRg7Jtu/fLgUuIi4gqgvmBMt8s/g+bQorYEW/f5cwW/Axid9dL6FbhlvskKj8uvSl/9Ov/kigyfgfI8RgwzfRbsQHvE6ZlMgVFgTmUyUKfkkft3LXo= 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=YrhYUhP3; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=gNXAjP/Y; arc=none smtp.client-ip=170.10.133.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="YrhYUhP3"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="gNXAjP/Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777964465; 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=nmU0xMG7ra+orDcAl7Q5QIsymSvh/y1zuyvrvlpHwIA=; b=YrhYUhP305Osv1ukn8NPEH3wxEqXHr3x5VNOWBxaY+poDZv0sW1vPm7BlC8t4B3+E7fk4A Whvk535GZ22KpbKTmnisMN7TlsqrF9/h5rn9ZSWvQU0VKkn7C4QfzJXFRurwJFIThL8Qfk UAOO78e9x9NM7DUUamL5b7LV1Y6DwCQ= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-144-Twar7CQtMOqjjoPZ4VF41A-1; Tue, 05 May 2026 03:01:02 -0400 X-MC-Unique: Twar7CQtMOqjjoPZ4VF41A-1 X-Mimecast-MFC-AGG-ID: Twar7CQtMOqjjoPZ4VF41A_1777964461 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-44ffa15dc8cso291665f8f.1 for ; Tue, 05 May 2026 00:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1777964460; x=1778569260; 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=nmU0xMG7ra+orDcAl7Q5QIsymSvh/y1zuyvrvlpHwIA=; b=gNXAjP/YCH+BJXEFZoPi3y5k7IyJTd7W9tOKKYEna/lRAJ55aGll9DNfER2xmL5JaR T2EqxiBnbFikIUbYCfclTRidRPMEtCto4Dk24YEX8pcI2+OKYDwgRdURN+X8H+ghZa1m lql8TUgJZtA7MJr1AxHGYz1N05zB/iRBBwBBGrGqm3anDCj6Cjz9cCBPZ59wXBxQsHxv Woyz/gORjpRKbRoyCAupeh0G2rZNaiS5e/1PZ2blfoLLX8qiNRjB3nwY104DVrhYwLIK lAJuF6quI5LPEUjsZxSoZCOYnjBiy/D7zl7w7vi/kssthzdTdKv1R9jkY+mmOieh+M78 Yajg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777964460; x=1778569260; 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=nmU0xMG7ra+orDcAl7Q5QIsymSvh/y1zuyvrvlpHwIA=; b=bWgL8jv/G8tQFszgnfStdQLqGuQJr73G52Cz8lq8yyzAP3wHVqtac2y7zSvZKyoUhG xKWySjgDV0XOv678QILjcg+Ov3XpJPrDFlL3mFynk57LxW1HPj+iUlwDm7aeueE5fmRt Z3pR3yULr0cgVBNtYm3uE9rzIGfQnpgRQwO5bqPzTtVkkM7lG4GXZdAV+gl7/H66u0j8 rOoJ9WcYbOjCDt/JwJp9LHk1mnOo8DyK6jrPCIenwHb68XMek2zaF5zzKG8EuPPkMgxp FLBXYjXfGqhY8dwQi6TxSf7gesEKITz3MMdXd9sEAYzW7WHLYbGYUnTNPul64MlAYrzi mONA== X-Gm-Message-State: AOJu0Yy34Nwp3fgb1r3PA6yB4ctwLmymV+uAIvUn3I1a0PA8SiLYG7IQ U2qjSwwcn/y8/l+CZKD9Bld81qDK+CVuOu4yKjAKG9fG4WT6CIqEQe43SfEUxD3m74Tkrt7E6Xt VTFub4oSaNvS9ficg1+sodEyvik5FdoeNrx2wgdHBXfeSsVLCURDiP7xvKkR+57KdMj3wU0L4HE TROuISZkMSLukGJImEEpJ8VaYh0OMCSVGwC7+WWO5XE7t6YkFW4A== X-Gm-Gg: AeBDieu5b32jYV6fc+FAQmZv4vrxoLSDo7exJl/0EWtTd6OYn8AZJAlUR6jZcI+93oy MiqDrS30dwGJ6iCoTnW1ovpssjhzuZmbRhHrOICgs2B69uf+SgAckLe7O0gfvSAG9YE8sJNWbeJ jyu7Sz09HyCPQygtzHS7Oi5TxMmEGSGgpf3vPZUX0kwliPb7emDmYJolrsdKeqOgyIQXX4zHgac MWbmnOD2pP0GERi8/XO7YvyjOtmXGS0sGYqa0p9AM+oyYleaYOTRC3mrlChCFhZlINlc3j/cfKd oJOQ2MQGBszGP0W0NhgsqfBKHuSRqqCFW8i0uxbqCkjYe4oHBw72TDnro612v7Jgkjjr6oEm88y aFBxzYXuJy2zsCrihBd3YuqWCyG1FUevw+yRmRO//7rMyOBm6joqxBukdlm5JLpBY06uOnVDdE7 4vS02Zu+5w7dJ0RIZrwbZlT5j+fw79+HTV04oafTw= X-Received: by 2002:a05:6000:24ca:b0:43d:7508:c9c9 with SMTP id ffacd0b85a97d-45005c81614mr3326440f8f.27.1777964460116; Tue, 05 May 2026 00:01:00 -0700 (PDT) X-Received: by 2002:a05:6000:24ca:b0:43d:7508:c9c9 with SMTP id ffacd0b85a97d-45005c81614mr3326348f8f.27.1777964459369; Tue, 05 May 2026 00:00:59 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-450524833e1sm2243371f8f.2.2026.05.05.00.00.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 00:00:58 -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.6.y] KVM: x86: Fix shadow paging use-after-free due to unexpected GFN Date: Tue, 5 May 2026 09:00:57 +0200 Message-ID: <20260505070057.198705-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 | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 0dc804149b0f..774bc26b8235 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -182,6 +182,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; @@ -1194,19 +1196,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_ONCE(sp->role.level =3D=3D PG_LEVEL_4K); - - drop_spte(kvm, sptep); - - if (flush) - kvm_flush_remote_tlbs_sptep(kvm, sptep); -} - /* * Write-protect on the specified @sptep, @pt_protect indicates whether * spte write-protection is caused by protecting shadow page table. @@ -2350,7 +2339,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); @@ -2428,13 +2418,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 --=20 2.54.0