| From 2562d67b1bdf91c7395b0225d60fdeb26b4bc5a0 Mon Sep 17 00:00:00 2001 |
| From: Andrew Morton <akpm@linux-foundation.org> |
| Date: Sat, 2 Sep 2023 15:59:31 -0700 |
| Subject: revert "memfd: improve userspace warnings for missing exec-related flags". |
| |
| From: Andrew Morton <akpm@linux-foundation.org> |
| |
| commit 2562d67b1bdf91c7395b0225d60fdeb26b4bc5a0 upstream. |
| |
| This warning is telling userspace developers to pass MFD_EXEC and |
| MFD_NOEXEC_SEAL to memfd_create(). Commit 434ed3350f57 ("memfd: improve |
| userspace warnings for missing exec-related flags") made the warning more |
| frequent and visible in the hope that this would accelerate the fixing of |
| errant userspace. |
| |
| But the overall effect is to generate far too much dmesg noise. |
| |
| Fixes: 434ed3350f57 ("memfd: improve userspace warnings for missing exec-related flags") |
| Reported-by: Damian Tometzki <dtometzki@fedoraproject.org> |
| Closes: https://lkml.kernel.org/r/ZPFzCSIgZ4QuHsSC@fedora.fritz.box |
| Cc: Aleksa Sarai <cyphar@cyphar.com> |
| Cc: Christian Brauner <brauner@kernel.org> |
| Cc: Daniel Verkamp <dverkamp@chromium.org> |
| Cc: Jeff Xu <jeffxu@google.com> |
| Cc: Kees Cook <keescook@chromium.org> |
| 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> |
| --- |
| mm/memfd.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/mm/memfd.c |
| +++ b/mm/memfd.c |
| @@ -315,7 +315,7 @@ SYSCALL_DEFINE2(memfd_create, |
| return -EINVAL; |
| |
| if (!(flags & (MFD_EXEC | MFD_NOEXEC_SEAL))) { |
| - pr_info_ratelimited( |
| + pr_warn_once( |
| "%s[%d]: memfd_create() called without MFD_EXEC or MFD_NOEXEC_SEAL set\n", |
| current->comm, task_pid_nr(current)); |
| } |
