From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B13AC2D0D0 for ; Mon, 23 Dec 2019 19:43:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F932206CB for ; Mon, 23 Dec 2019 19:43:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727158AbfLWTnQ (ORCPT ); Mon, 23 Dec 2019 14:43:16 -0500 Received: from [66.170.99.2] ([66.170.99.2]:12320 "EHLO sid-build-box.eng.vmware.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726934AbfLWTm5 (ORCPT ); Mon, 23 Dec 2019 14:42:57 -0500 Received: by sid-build-box.eng.vmware.com (Postfix, from userid 1000) id 10F2ABA17BE; Tue, 24 Dec 2019 01:07:15 +0530 (IST) From: Siddharth Chandrasekaran To: torvalds@linux-foundation.org Cc: gregkh@linuxfoundation.org, sashal@kernel.org, jannh@google.com, linux-kernel@vger.kernel.org, stable@vger.kernel.org, siddharth@embedjournal.com, Siddharth Chandrasekaran Subject: [PATCH 4.4 2/2] filldir[64]: remove WARN_ON_ONCE() for bad directory entries Date: Tue, 24 Dec 2019 01:06:33 +0530 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linus Torvalds [ 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 Signed-off-by: Siddharth Chandrasekaran --- fs/readdir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/readdir.c b/fs/readdir.c index 4c6ffe3..3494d7a 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -77,9 +77,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