From c7040e764ab4050bd28568425a6b6ca1ceb63726 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 20 Feb 2025 04:16:41 +0200 Subject: [PATCH] userfaultd: Fix mismerge of ASB-2024-11-05_11-5.4 Change-Id: I709043d9ae119d2676523b57a0b066a897591f24 --- fs/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 180ddfac7db0..122e03b7350a 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -1652,7 +1652,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, * the current one has not been updated yet. */ vm_write_begin(vma); - WRITE_ONCE(vma->vm_flags, vma_pad_fixup_flags(vma, new_flags);); + WRITE_ONCE(vma->vm_flags, vma_pad_fixup_flags(vma, new_flags)); vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; vm_write_end(vma);