Skip to content

Commit cb42d9e

Browse files
Audra Mitchellsmb49
authored andcommitted
Fix userfaultfd_api to return EINVAL as expected
BugLink: https://bugs.launchpad.net/bugs/2078289 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/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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Portia Stephens <portia.stephens@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 7181c79 commit cb42d9e

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
@@ -2096,7 +2096,7 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx,
20962096
goto out;
20972097
features = uffdio_api.features;
20982098
ret = -EINVAL;
2099-
if (uffdio_api.api != UFFD_API || (features & ~UFFD_API_FEATURES))
2099+
if (uffdio_api.api != UFFD_API)
21002100
goto err_out;
21012101
ret = -EPERM;
21022102
if ((features & UFFD_FEATURE_EVENT_FORK) && !capable(CAP_SYS_PTRACE))
@@ -2120,6 +2120,11 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx,
21202120
uffdio_api.features &= ~UFFD_FEATURE_WP_UNPOPULATED;
21212121
uffdio_api.features &= ~UFFD_FEATURE_WP_ASYNC;
21222122
#endif
2123+
2124+
ret = -EINVAL;
2125+
if (features & ~uffdio_api.features)
2126+
goto err_out;
2127+
21232128
uffdio_api.ioctls = UFFD_API_IOCTLS;
21242129
ret = -EFAULT;
21252130
if (copy_to_user(buf, &uffdio_api, sizeof(uffdio_api)))

0 commit comments

Comments
 (0)