This is a note to let you know that I've just added the patch titled
filldir[64]: remove WARN_ON_ONCE() for bad directory entries
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
filldir-remove-warn_on_once-for-bad-directory-entries.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b9959c7a347d6adbb558fba7e36e9fef3cba3b07 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri, 18 Oct 2019 18:41:16 -0400
Subject: filldir[64]: remove WARN_ON_ONCE() for bad directory entries
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit b9959c7a347d6adbb558fba7e36e9fef3cba3b07 upstream.
This was always meant to be a temporary thing, just for testing and to
see if it actually ever triggered.
The only thing that reported it was syzbot doing disk image fuzzing, and
then that warning is expected. So let's just remove it before -rc4,
because the extra sanity testing should probably go to -stable, but we
don't want the warning to do so.
Reported-by: syzbot+3031f712c7ad5dd4d926@xxxxxxxxxxxxxxxxxxxxxxxxx
Fixes: 8a23eb804ca4 ("Make filldir[64]() verify the directory entry filename is valid")
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Siddharth Chandrasekaran <csiddharth@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/readdir.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -91,9 +91,9 @@ EXPORT_SYMBOL(iterate_dir);
*/
static int verify_dirent_name(const char *name, int len)
{
- if (WARN_ON_ONCE(!len))
+ if (!len)
return -EIO;
- if (WARN_ON_ONCE(memchr(name, '/', len)))
+ if (memchr(name, '/', len))
return -EIO;
return 0;
}
Patches currently in stable-queue which might be from torvalds@xxxxxxxxxxxxxxxxxxxx are
queue-4.19/ocfs2-fix-passing-zero-to-ptr_err-warning.patch
queue-4.19/make-filldir-verify-the-directory-entry-filename-is-valid.patch
queue-4.19/userfaultfd-require-cap_sys_ptrace-for-uffd_feature_.patch
queue-4.19/kernel-sysctl-make-drop_caches-write-only.patch
queue-4.19/filldir-remove-warn_on_once-for-bad-directory-entries.patch
queue-4.19/shmem-pin-the-file-in-shmem_fault-if-mmap_sem-is-dropped.patch
