| From 1a52e3b3cbf0e337f5a0f3f2976b5de21947bb0c Mon Sep 17 00:00:00 2001 |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| Date: Fri, 18 Oct 2019 18:41:16 -0400 |
| Subject: [PATCH] filldir[64]: remove WARN_ON_ONCE() for bad directory entries |
| |
| 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@syzkaller.appspotmail.com |
| Fixes: 8a23eb804ca4 ("Make filldir[64]() verify the directory entry filename is valid") |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/readdir.c b/fs/readdir.c |
| index 6e2623e57b2e..d26d5ea4de7b 100644 |
| --- a/fs/readdir.c |
| +++ b/fs/readdir.c |
| @@ -105,9 +105,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; |
| } |
| -- |
| 2.7.4 |
| |
