]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
filldir[64]: remove WARN_ON_ONCE() for bad directory entries
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Oct 2019 22:41:16 +0000 (18:41 -0400)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 12 Nov 2019 17:46:20 +0000 (18:46 +0100)
BugLink: https://bugs.launchpad.net/bugs/1850456
[ Upstream commit b9959c7a347d6adbb558fba7e36e9fef3cba3b07 ]

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: Sasha Levin <sashal@kernel.org>
Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
fs/readdir.c

index 6e2623e57b2e81ce3292016caeea82695d783d36..d26d5ea4de7b8958ea3d48069cd873b50398cd88 100644 (file)
@@ -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;
 }