Skip to content

Commit 8b795ed

Browse files
Audra Mitchellroxanan1996
Audra Mitchell
authored andcommitted
Fix userfaultfd_api to return EINVAL as expected
BugLink: https://bugs.launchpad.net/bugs/2075170 commit 1723f04caacb32cadc4e063725d836a0c4450694 upstream. Currently if we request a feature that is not set in the Kernel config we fail silently and return all the available features. However, the man page indicates we should return an EINVAL. We need to fix this issue since we can end up with a Kernel warning should a program request the feature UFFD_FEATURE_WP_UNPOPULATED on a kernel with the config not set with this feature. [ 200.812896] WARNING: CPU: 91 PID: 13634 at mm/memory.c:1660 zap_pte_range+0x43d/0x660 [ 200.820738] Modules linked in: [ 200.869387] CPU: 91 PID: 13634 Comm: userfaultfd Kdump: loaded Not tainted 6.9.0-rc5+ #8 [ 200.877477] Hardware name: Dell Inc. PowerEdge R6525/0N7YGH, BIOS 2.7.3 03/30/2022 [ 200.885052] RIP: 0010:zap_pte_range+0x43d/0x660 Link: https://lkml.kernel.org/r/[email protected] Fixes: e06f1e1 ("userfaultfd: wp: enabled write protection in userfaultfd API") Signed-off-by: Audra Mitchell <[email protected]> Cc: Al Viro <[email protected]> Cc: Andrea Arcangeli <[email protected]> Cc: Christian Brauner <[email protected]> Cc: Jan Kara <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Peter Xu <[email protected]> Cc: Rafael Aquini <[email protected]> Cc: Shaohua Li <[email protected]> Cc: Shuah Khan <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent d2a3653 commit 8b795ed

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

fs/userfaultfd.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1935,7 +1935,7 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx,
19351935
goto out;
19361936
features = uffdio_api.features;
19371937
ret = -EINVAL;
1938-
if (uffdio_api.api != UFFD_API || (features & ~UFFD_API_FEATURES))
1938+
if (uffdio_api.api != UFFD_API)
19391939
goto err_out;
19401940
ret = -EPERM;
19411941
if ((features & UFFD_FEATURE_EVENT_FORK) && !capable(CAP_SYS_PTRACE))
@@ -1949,6 +1949,11 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx,
19491949
#ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP
19501950
uffdio_api.features &= ~UFFD_FEATURE_PAGEFAULT_FLAG_WP;
19511951
#endif
1952+
1953+
ret = -EINVAL;
1954+
if (features & ~uffdio_api.features)
1955+
goto err_out;
1956+
19521957
uffdio_api.ioctls = UFFD_API_IOCTLS;
19531958
ret = -EFAULT;
19541959
if (copy_to_user(buf, &uffdio_api, sizeof(uffdio_api)))

0 commit comments

Comments
 (0)