]> git.hungrycats.org Git - linux/commitdiff
KVM: guest_memfd: Establish memslot<=>guest_memfd bindings *after* memslot is ready
authorSean Christopherson <seanjc@google.com>
Tue, 22 Sep 2026 00:13:31 +0000 (17:13 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:10:49 +0000 (12:10 -0500)
commit 3fe5d2944e5ac3fc5073344b0982c73703332e18 upstream.

Wait to bind a memslot to a guest_memfd instance until *after* the memslot
is fully prepared, as creating the binding in guest_memfd will effectively
expose the memslot to readers.  As pointed out by Sashiko, binding the
memslot before it's ready to be exposed to the rest of the world can break
various memslot assumption and rules.  E.g. x86 could observe a NULL rmap
pointer if a PUNCH_HOLE hit the guest_memfd after the binding was created,
but before KVM made it through kvm_prepare_memory_region().

Fixes: a7800aa80ea4 ("KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory")
Cc: stable@vger.kernel.org
Reported-by: Sashiko Bot <sashiko-bot@kernel.org>
Closes: https://lore.kernel.org/all/20260826170551.BEF801F000E9@smtp.kernel.org
Link: https://patch.msgid.link/20260922001332.1121266-6-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
virt/kvm/kvm_main.c

index a7c12afed34f77c6bd2ce56a0308424991ba53fb..6bd1c427fc03a5996b8bed76f4296c15bd1da6bd 100644 (file)
@@ -1950,6 +1950,15 @@ static int kvm_set_memslot(struct kvm *kvm,
        if (r)
                goto err;
 
+       if (change == KVM_MR_CREATE && (new->flags & KVM_MEM_GUEST_MEMFD)) {
+               r = kvm_gmem_commit_memory_region(kvm, new);
+               if (r) {
+                       kvm_arch_free_memslot(kvm, new);
+                       kvm_destroy_dirty_bitmap(new);
+                       goto err;
+               }
+       }
+
        /*
         * For DELETE and MOVE, the working slot is now active as the INVALID
         * version of the old slot.  MOVE is particularly special as it reuses
@@ -2127,32 +2136,25 @@ static int kvm_set_memory_region(struct kvm *kvm,
                                                   mem->guest_memfd_offset);
                if (r)
                        goto out;
+       }
 
-               r = kvm_gmem_commit_memory_region(kvm, new);
+       r = kvm_set_memslot(kvm, old, new, change);
 
-               /*
-                * Drop the reference to the file, even on success.  The file
-                * pins KVM, not the other way 'round.  Active bindings are
-                * invalidated if the file is closed before memslots are
-                * destroyed.
-                */
+       /*
+        * Drop the reference to the gmem file, even on success.  The file pins
+        * KVM, not the other way 'round.  Active bindings are invalidated if
+        * the file is closed before memslots are destroyed.
+        */
 #ifdef CONFIG_KVM_GUEST_MEMFD
-                fput(new->gmem.file);
+       if (change == KVM_MR_CREATE && (mem->flags & KVM_MEM_GUEST_MEMFD))
+               fput(new->gmem.file);
 #endif
 
-               if (r)
-                       goto out;
-       }
-
-       r = kvm_set_memslot(kvm, old, new, change);
        if (r)
-               goto out_unbind;
+               goto out;
 
        return 0;
 
-out_unbind:
-       if (change == KVM_MR_CREATE && (mem->flags & KVM_MEM_GUEST_MEMFD))
-               kvm_gmem_unbind(new);
 out:
        kfree(new);
        return r;