From patchwork Thu Jan 2 22:07:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 234548 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 9F458C3F68F for ; Thu, 2 Jan 2020 22:52:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C14D21835 for ; Thu, 2 Jan 2020 22:52:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578005551; bh=Ur6uZT7dQ28R1SaIXCdt2Sy9psXIvln3QsjpYSVrcs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TnD5ZT8RJfa2eM96vvP3eyipqJr/+utMMpng9lhYWLsJY1r6ojjWt0VrUnSrefz0r ySIEyxhRHao9QRB8BntqRLJNuwxP6UI7OAad7dXDyAv702R18nM89ZX6puGdTuON86 h4zorGpTQ1it06XX6Wz2TWFdZf14icZyIUMrkHUs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729193AbgABWW4 (ORCPT ); Thu, 2 Jan 2020 17:22:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:43912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729189AbgABWWw (ORCPT ); Thu, 2 Jan 2020 17:22:52 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09B6020863; Thu, 2 Jan 2020 22:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003771; bh=Ur6uZT7dQ28R1SaIXCdt2Sy9psXIvln3QsjpYSVrcs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kKDhETNZfr+GZE2sGA70J26fW1LD3+ucS3EFiFeySryGeXFeA9eRn5t0HYmS0B88J 2tBF4zQ57sdlL9+t6bcOwi0q3CWoxpklj8nuYuu1u1AHwbFiSshSkLRyPSHEN9CA0H lmZk6iubadvjdP2hZcl7r+r6O8LlwmjV2Yi1v4K0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+3031f712c7ad5dd4d926@syzkaller.appspotmail.com, Linus Torvalds , Siddharth Chandrasekaran Subject: [PATCH 4.19 081/114] filldir[64]: remove WARN_ON_ONCE() for bad directory entries Date: Thu, 2 Jan 2020 23:07:33 +0100 Message-Id: <20200102220037.307284614@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220029.183913184@linuxfoundation.org> References: <20200102220029.183913184@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Torvalds 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 Signed-off-by: Siddharth Chandrasekaran Signed-off-by: Greg Kroah-Hartman --- 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; }