linux-kernel - [PATCH 4.19 2/2] filldir[64]: remove WARN_ON

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <7f71c415d45ab489c2377e07ac80062ca7db5335.1577128883.git.csiddharth@vmware.com>
Date:   Tue, 24 Dec 2019 01:06:30 +0530
From:   Siddharth Chandrasekaran <csiddharth@...are.com>
To:     torvalds@...ux-foundation.org
Cc:     gregkh@...uxfoundation.org, sashal@...nel.org, jannh@...gle.com,
        linux-kernel@...r.kernel.org, stable@...r.kernel.org,
        siddharth@...edjournal.com,
        Siddharth Chandrasekaran <csiddharth@...are.com>
Subject: [PATCH 4.19 2/2] filldir[64]: remove WARN_ON_ONCE() for bad directory entries

From: Linus Torvalds <torvalds@...ux-foundation.org>

[ 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@...kaller.appspotmail.com
Fixes: 8a23eb804ca4 ("Make filldir[64]() verify the directory entry filename is valid")
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Siddharth Chandrasekaran <csiddharth@...are.com>
---
 fs/readdir.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/readdir.c b/fs/readdir.c
index ace19d9..1059f2a 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -90,9 +90,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