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.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 604573D2FE0 for ; Tue, 5 May 2026 07:00:03 +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=1777964414; cv=none; b=rdJI4KLr522b1VgsshWI2lkiDjzWbeWKKxiQLV4yKNiRDGVI8wjQ1P0NzLfwI3Uoj/oNCpWV3sMbVzHbu6aYPlP22mG3QUAfhFUt4pMVVNaqlqPvToez6OyHM9M5jewNwVofi1p1rH8xPYzFR0oXiQVZYDvU5i8rMF/Gfb4TrOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777964414; c=relaxed/simple; bh=4C1O+8Yb28gsJ7ML7nEymKcrBpr/Esj8D8nSpfVwuLs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LcDBtIWt5/iJ8oxHXGdHaseRAf73wpgTVGlRPNWxeILmHqipdNDzOVXFdO6keBaiSSy7LU6BMxp3hn6yLBP3gbm6yAMb6hCsl6zUHnYyBk8QE7x7P9YFhw//8DDNmKtuZOEVqw4ejFL6aIY7pRsJp1lrA32SWX8o5POzXUSurwM= 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=gZrFztV5; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=jZUGHX7N; 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="gZrFztV5"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="jZUGHX7N" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777964402; 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=x2E3eylXZgkiQ5B17tOE4z6voBdoulQpJBVyOORx3Bk=; b=gZrFztV56/TazIH0SLiUt4w4wHRXL8mbCWLyi14LnQ0w70kuOwwmUQZ9mGUutVOjg5QW3G 3etbkZdhVHzBOJAffnTWnTkIh14qRejbp24/prZPUQQNx+bzeqTJm8CAPkc3jlW81sDIVj mpJnqndyUwFJre5hhKSKG397MV23hMc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-529-povF_Vq5OOqViEWgfjg9uw-1; Tue, 05 May 2026 03:00:01 -0400 X-MC-Unique: povF_Vq5OOqViEWgfjg9uw-1 X-Mimecast-MFC-AGG-ID: povF_Vq5OOqViEWgfjg9uw_1777964400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-43d7a5b9678so3925199f8f.2 for ; Tue, 05 May 2026 00:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1777964400; x=1778569200; 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=x2E3eylXZgkiQ5B17tOE4z6voBdoulQpJBVyOORx3Bk=; b=jZUGHX7NWQwsb0BUqbanQfYz7zGOebHBEsw3fcfUwiJaR9gAy/S8B4L1okp380qF9+ lR4l+HIqJTl55CWfMjksBuAza0OnQNinS2K0SwwmF/cGciEhdcATbR/bEe12kWPzJfIk ADz1VFQjfX4delJQx5qqsq5g/8sp+FMFLz3h2VdP7tRIiESSctexq8mN3saY5nB5osFV J5tpc0LEBl2+vXSFNTrElyegTMS6dJTIXDzKtdc0dCoI7KW1wsUyvtQLtwJ0OKdmVp5m EePmxRgoxNwxCb6f0TDdEMo6LaNp0p2uEN5BWngMOZEXJAFvoOLaQdpPML5WLCNFeb0K PJzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777964400; x=1778569200; 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=x2E3eylXZgkiQ5B17tOE4z6voBdoulQpJBVyOORx3Bk=; b=NEQOm/eAwaZP60PokkVkNfGV67ttnoe/+SQazBQLCp6eOay2Ku3bTxl2p3afrXbQtF HBHwFKXi6BWS7rd9jP3nEFVac3x9Ds8Rz+XCMZKklSz3gS9aDIjmS5PGEZV4cu7cpAz1 XAn23OOXXMLy8PFxSjrcfpQddDg3snB0NviBs2MIXSYE7HZGygits/CWclcumSWxI42R A3e1oWM4gume4mfo1pq7tD6sMZhkcW71BXVOTXdRZ/HAFzE1lmpXSClYXTZ97GbaCEY5 qeGI582t9M4GhW+Jx513027dEeDTmO7eJksDWAvTYdly8eOFL3X86fGw64aIqthA2IV8 dB1A== X-Gm-Message-State: AOJu0YyLcnr2oAUEUYDZY4Y7oiUGeNEP3Mrww3vOy08PSFOzCWYW4iJl +GeyAA+LT9iakfhayJpU/Hz6LPi2pIdjEUUxsW+VXpvp0lY9K85WOV6fLBHOYbUU//G/WKxklKe yEBH4Rshsc4cK8/gY7tkert6upKUf7ohulkD7jgn7o8rnERGo4Fp4ycelUUzNtOazsTs30tZ54C etnSL5QzN/eDt/22PK1pvZ4d4/k92AVe14KbNzCxSk8uVoSdD4RA== X-Gm-Gg: AeBDiet/CU3GncTRK7ZLShJALoi17tfNshbhlUqwf6FwGOM/Z2es3R4EZZZepiAaE5w CocaQCEz9Ijc2N8Nn0G2h49ELUUhfjf0aXY3hOJ0F6hNUUGKOuUmPLbUhDr3iQR40PbcPYeTpys J1+xSRzbIzuJoDbZKdZBwD8YGbLOPlbk62pzfsNCClyE/hvSQyAROCfd0MgK8Ek6DJqy1GpNWPh qsPSHLSgP8s3WV/azzH+fMTGrI0jjYNbK53KqDLK3KJPN54mB+hvIWwPzjeR8xgjKBVJGTBjS9q dpe9MpyP2H7QbJOlJ0lNPeDW56vVznh8S++DmZyzLF/3IyVQJy3g7H2UlOeNH3n0EqvYy8PcW9k Iepoj1WCWrK4mv3hSw74tNmWvNoG55IJSdVkmKt47QMY80Kb28iwEhLt+HOgAVyEg4wcWthhsIE DP4zW7mx30GETUxoneTOPoTYm02RtkKdq6aK1tfrA= X-Received: by 2002:a05:6000:24c9:b0:43d:21a:9a3e with SMTP id ffacd0b85a97d-44bb65dfc18mr19767222f8f.32.1777964399092; Mon, 04 May 2026 23:59:59 -0700 (PDT) X-Received: by 2002:a05:6000:24c9:b0:43d:21a:9a3e with SMTP id ffacd0b85a97d-44bb65dfc18mr19767108f8f.32.1777964398115; Mon, 04 May 2026 23:59:58 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4505238e6e0sm2069200f8f.6.2026.05.04.23.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 23:59:57 -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.12.y] KVM: x86: Fix shadow paging use-after-free due to unexpected GFN Date: Tue, 5 May 2026 08:59:56 +0200 Message-ID: <20260505065956.194882-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 2c11819bd216..d288c60ae200 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; @@ -1187,19 +1189,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. @@ -2342,7 +2331,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); @@ -2420,13 +2410,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