Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm: userfaultfd: fix UFFDIO_CONTINUE on fallocated shmem pages

When fallocate() is used on a shmem file, the pages we allocate can end up
with !PageUptodate.

Since UFFDIO_CONTINUE tries to find the existing page the user wants to
map with SGP_READ, we would fail to find such a page, since
shmem_getpage_gfp returns with a "NULL" pagep for SGP_READ if it discovers
!PageUptodate. As a result, UFFDIO_CONTINUE returns -EFAULT, as it would
do if the page wasn't found in the page cache at all.

This isn't the intended behavior. UFFDIO_CONTINUE is just trying to find
if a page exists, and doesn't care whether it still needs to be cleared or
not. So, instead of SGP_READ, pass in SGP_NOALLOC. This is the same,
except for one critical difference: in the !PageUptodate case, SGP_NOALLOC
will clear the page and then return it. With this change, UFFDIO_CONTINUE
works properly (succeeds) on a shmem file which has been fallocated, but
otherwise not modified.

Link: https://lkml.kernel.org/r/20220610173812.1768919-1-axelrasmussen@google.com
Fixes: 153132571f02 ("userfaultfd/shmem: support UFFDIO_CONTINUE for shmem")
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
Acked-by: Peter Xu <peterx@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Axel Rasmussen and committed by
akpm
73f37dbc 03c765b0

+4 -1
+4 -1
mm/userfaultfd.c
··· 246 246 struct page *page; 247 247 int ret; 248 248 249 - ret = shmem_getpage(inode, pgoff, &page, SGP_READ); 249 + ret = shmem_getpage(inode, pgoff, &page, SGP_NOALLOC); 250 + /* Our caller expects us to return -EFAULT if we failed to find page. */ 251 + if (ret == -ENOENT) 252 + ret = -EFAULT; 250 253 if (ret) 251 254 goto out; 252 255 if (!page) {