Commit 6ca03f1b authored by Lokesh Gidra's avatar Lokesh Gidra Committed by Andrew Morton
Browse files

userfaultfd: fix return error if mmap_changing is non-zero in MOVE ioctl 

To be consistent with other uffd ioctl's returning EAGAIN when
mmap_changing is detected, we should change UFFDIO_MOVE to do the same.

Link: https://lkml.kernel.org/r/20240117223922.1445327-1-lokeshgidra@google.com


Signed-off-by: default avatarLokesh Gidra <lokeshgidra@google.com>
Acked-by: default avatarSuren Baghdasaryan <surenb@google.com>
Acked-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Brian Geffon <bgeffon@google.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jann Horn <jannh@google.com>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Nicolas Geoffray <ngeoffray@google.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a9117b4d

fs/userfaultfd.c

+1 −1
Original line number Diff line number Diff line
@@ -2047,7 +2047,7 @@ static int userfaultfd_move(struct userfaultfd_ctx *ctx, 
			ret = move_pages(ctx, mm, uffdio_move.dst, uffdio_move.src,

					 uffdio_move.len, uffdio_move.mode);

		else

			ret = -EINVAL;

			ret = -EAGAIN;



		mmap_read_unlock(mm);

		mmput(mm);