From nobody Sun Jun 14 00:14:08 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 CC94C3C2779 for ; Tue, 5 May 2026 06:59: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=1777964345; cv=none; b=tswWQEDng9pQliG7SKBQEIopBJMUPPl30ko2ny8LCIEZC1rO6tYxcGFMiEQdWYGX+R4ss2c/30NBGU3FaZ1QWntaGRJC5qO555JFSm0rrI/mCdPlpcAvlrW4atewyZa7G8sMI4lC2UhcB4T24QLgPFLDjHnPoD19rJwdapy+fL0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777964345; c=relaxed/simple; bh=XWPfFYfLhTLa5UB2Be1O7e4jiG88hQHB1AvjGlRbkLg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Bjy8uQXJqFvyGh/taSwDcUpNNKdyhufBxPYBqq7MlIk97r78YBK6e7v3evP8FSfMP41EugPPaIl71lsJrM7y1vudUHSLtkoFU7GboCMZIj7w8ed3CxvobqoMlA45KlemxYXjIqKfjb7now9D8fIeQB9k3kxDhNOVigXYhLTabb4= 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=DA76kWVJ; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZbB8mqiQ; 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="DA76kWVJ"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZbB8mqiQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777964343; 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=Dzf0pfUjAeoFIT+o1UyKLxzb+hMySmis8LYkbCCF47M=; b=DA76kWVJ4CKDFKkCXs2ZG9yH+/sY3AyfrG51yfRRaJXmA3AVvfQVznpLoBC9Wox9dgPqsu njBE/YRFNsROVEIeaDMnMqeG1FesleJEsfmkHP3zhTX1xd72e8/k/ynacuP3IS+Ed1b0ni 3x1fYY4Fm1oBSQ9g0l+AOaGmtKAQFFw= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-so92qkEhMWm2RRrMSnR4FA-1; Tue, 05 May 2026 02:59:01 -0400 X-MC-Unique: so92qkEhMWm2RRrMSnR4FA-1 X-Mimecast-MFC-AGG-ID: so92qkEhMWm2RRrMSnR4FA_1777964341 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-48a588ff84eso42026895e9.1 for ; Mon, 04 May 2026 23:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1777964340; x=1778569140; 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=Dzf0pfUjAeoFIT+o1UyKLxzb+hMySmis8LYkbCCF47M=; b=ZbB8mqiQ8iJxv6fkf8ZQZj0dljC1X5iYZeWVjFN1FqjPsEZEucprUyh3YV1eq9D8H3 7c/PesDVkgmvYCJDAdcM1qmpQeTKuiOqXvHL8cewOK8UZLazXCfZzUP0RtVKWOzg98zZ WCJ+SKI8/9y/XuehL4nqi72mAen0cm6WmYe3Jw8+pjfPfe94+K8pjXKU9T5d/pubGuaI lMA4PQkedgR4Qb65Fip5Pb7QHblsBZ2LRRcdg/XC4hTdiiD1PtbX+47D54YTVEXmKbil TXMX/dcAWhVlL0wLRiBYli8ne1+4w5UTpcKjNDOqRm7U54BHOKtA5r6tY05hqfQmaDpk ZCAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777964340; x=1778569140; 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=Dzf0pfUjAeoFIT+o1UyKLxzb+hMySmis8LYkbCCF47M=; b=XDVAWuCn/YLScEuGMwto6nf74qz74Wt57FBw3wHJpPwxY02UHkAw82rkqiP5M8Xl21 vLuW9r3xjMhInb1gb8O/hytyfEmrVlWTU+gPMkEMnIv/WqqCNqEnQp1Q7I1JO8tNWG3M /2xC2J5WJLnE9wKHzG5vyvEJJygz7aiGT7lxd6df+9hx4eUu2yB/RpDltkIoDMJkPtYJ aF1aJ1NEXET15jggUX4GWqYgxhNbeTRfX99ik9g2GJzkUQI+0DaEhYLjZRISYX+ttDUx swFDns9r/mQyTZHAfFDYXf9wtaZ5a5DnENmE57ACAweyBrw4q1YERXSVwqzT2QlXj4US NOJw== X-Gm-Message-State: AOJu0YxseCmP/hirUfrYt7XPrzXV1zy/tsNl+8zqHPxnDL0jwuX1mpol T21MpFgQEGbnKC3rqVzpr2fRbggSYOVgR5hIeYepJskG8gRqq2oAbBTWMlW4nGIf6Q1YwX98KAi sbw0IPIrjHniLH/NU/zxSgU0ufs6i1mlOdMqudAnko4D5GSwncjJsmpovP1xy41GA4m+M5c5Pm+ CcQPASq+z4nVul49efN7D5D6e/Tn6nbgacPvKqBF6TEYY8qYLWrw== X-Gm-Gg: AeBDiesrq1uN9Z3mRd5krRm0TeckruxDmkPQ0aUnBZuHUSzQRibYkNWaDtnaZ5c00Yv dSnH09TUXolZktae2VWnr7JlWWBPWhnaTaBVeLeNNd6E60l70WR5BvO6r68VTaRgwyyPhEkciZQ ZQ8nzP9lpb5tmLnbUliBwl6XT057nvoX6nF2seThDKJRMI4P9d+PGCUtnRqtcAeD/uUkWzIQB4k NkbvlGYbF66Hu1gSoL/WWccxYXbmnRDYH7WG7W5PIka5NLb9EefwYuixiNl2KcqJdGbe7PQOvyO 2sdQVMTQHa3lfDby7/5H0TIO6BITiGptNarstpxrHJq3TXfycuVgsjbGe7mqZ0SfxjE1mAIomXk CEPKKInZqfCdiBlJyDJZm93bJVR3pDn6QV7nuJ7hsAPU/QlwMPEOhb9IR8iZ2XB/4bbXvtZu5WR dguu9hTNVxTUi3KUkv40tIgLa7pTNK15JE3RLKqOU= X-Received: by 2002:a05:600c:1386:b0:488:9439:881a with SMTP id 5b1f17b1804b1-48a9852f471mr202492735e9.2.1777964340203; Mon, 04 May 2026 23:59:00 -0700 (PDT) X-Received: by 2002:a05:600c:1386:b0:488:9439:881a with SMTP id 5b1f17b1804b1-48a9852f471mr202492365e9.2.1777964339720; Mon, 04 May 2026 23:58:59 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48af0d5a613sm130595745e9.2.2026.05.04.23.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 23:58:59 -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.18.y] KVM: x86: Fix shadow paging use-after-free due to unexpected GFN Date: Tue, 5 May 2026 08:58:57 +0200 Message-ID: <20260505065857.190809-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 dad7abb1112b..0bd0cb8992c9 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -182,6 +182,8 @@ static struct kmem_cache *pte_list_desc_cache; struct kmem_cache *mmu_page_header_cache; =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; @@ -1287,19 +1289,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. @@ -2466,7 +2455,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); @@ -2544,13 +2534,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