Skip to content

Commit 1723f04

Browse files
Audra Mitchellakpm00
authored andcommitted
Fix userfaultfd_api to return EINVAL as expected
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/20240626130513.120193-1-audra@redhat.com Fixes: e06f1e1 ("userfaultfd: wp: enabled write protection in userfaultfd API") Signed-off-by: Audra Mitchell <audra@redhat.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Christian Brauner <brauner@kernel.org> Cc: Jan Kara <jack@suse.cz> Cc: Mike Rapoport <rppt@linux.vnet.ibm.com> Cc: Peter Xu <peterx@redhat.com> Cc: Rafael Aquini <raquini@redhat.com> Cc: Shaohua Li <shli@fb.com> Cc: Shuah Khan <shuah@kernel.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent a34acf3 commit 1723f04

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
@@ -2057,7 +2057,7 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx,
20572057
goto out;
20582058
features = uffdio_api.features;
20592059
ret = -EINVAL;
2060-
if (uffdio_api.api != UFFD_API || (features & ~UFFD_API_FEATURES))
2060+
if (uffdio_api.api != UFFD_API)
20612061
goto err_out;
20622062
ret = -EPERM;
20632063
if ((features & UFFD_FEATURE_EVENT_FORK) && !capable(CAP_SYS_PTRACE))
@@ -2081,6 +2081,11 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx,
20812081
uffdio_api.features &= ~UFFD_FEATURE_WP_UNPOPULATED;
20822082
uffdio_api.features &= ~UFFD_FEATURE_WP_ASYNC;
20832083
#endif
2084+
2085+
ret = -EINVAL;
2086+
if (features & ~uffdio_api.features)
2087+
goto err_out;
2088+
20842089
uffdio_api.ioctls = UFFD_API_IOCTLS;
20852090
ret = -EFAULT;
20862091
if (copy_to_user(buf, &uffdio_api, sizeof(uffdio_api)))

0 commit comments

Comments
 (0)