From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACD0613C68A for ; Thu, 13 Jun 2024 10:59:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718276385; cv=none; b=GmXvHF2SEl89MqMDil0p1D1Z+P3vC4kfL/qbVQ8FLduXBJwk/qAtYPCw2uDUUZyBW085Qm7RbwLVIZVdu2Ii3ygUfv1gdkrZGpEPC32aLx4chx9Cewhr4yxLZxoC85TVyiPRu3oefE6fMkMxl+PsbjBCp7fPtIF7kZGA/QKqS9c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718276385; c=relaxed/simple; bh=M9SGDg9t1jAmCUwq/H51ExJ3QoRsu7XU3MaRiB18bj8=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=uMFhqggnTB4MjSho9nHSYh7ZK4I8QN0szYzEE3PCtyOjZwz5X/0VqxUeZ23RqO1eRL7yueo9E2dB4WeCwtcPx9O6PD2GAUhIIPqGpThutnkO2++/yU/d3Ved3sImTFQ0gi14/YVqFmt/Yi3UNcbH+BcYoUNSHWnpvWUeO9PjwUk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GlIGlOGK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GlIGlOGK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34CACC2BBFC; Thu, 13 Jun 2024 10:59:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718276385; bh=M9SGDg9t1jAmCUwq/H51ExJ3QoRsu7XU3MaRiB18bj8=; h=Subject:To:Cc:From:Date:From; b=GlIGlOGKm2JOkcjteXK420EwQKU+HZVmK63kXJp+sGmh2mkxGq7Q7a7pSkJEaghYi y6KSI1vAddZfo2wUTwlxQwA0GGWcxm6bVFb8TrN1URknfDN2XF/atmHfNtsvL8vYdh 3fvZJgr08aeSHjxQh83J42HU4WiGhfltvBJZps4M= Subject: FAILED: patch "[PATCH] nilfs2: fix nilfs_empty_dir() misjudgment and long loop on" failed to apply to 6.1-stable tree To: konishi.ryusuke@gmail.com,akpm@linux-foundation.org,stable@vger.kernel.org Cc: From: Date: Thu, 13 Jun 2024 12:59:36 +0200 Message-ID: <2024061336-douche-credibly-5e48@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 7373a51e7998b508af7136530f3a997b286ce81c # git commit -s git send-email --to '' --in-reply-to '2024061336-douche-credibly-5e48@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 7373a51e7998 ("nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors") 09a46acb3697 ("nilfs2: return the mapped address from nilfs_get_page()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 7373a51e7998b508af7136530f3a997b286ce81c Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Tue, 4 Jun 2024 22:42:55 +0900 Subject: [PATCH] nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors The error handling in nilfs_empty_dir() when a directory folio/page read fails is incorrect, as in the old ext2 implementation, and if the folio/page cannot be read or nilfs_check_folio() fails, it will falsely determine the directory as empty and corrupt the file system. In addition, since nilfs_empty_dir() does not immediately return on a failed folio/page read, but continues to loop, this can cause a long loop with I/O if i_size of the directory's inode is also corrupted, causing the log writer thread to wait and hang, as reported by syzbot. Fix these issues by making nilfs_empty_dir() immediately return a false value (0) if it fails to get a directory folio/page. Link: https://lkml.kernel.org/r/20240604134255.7165-1-konishi.ryusuke@gmail.com Signed-off-by: Ryusuke Konishi Reported-by: syzbot+c8166c541d3971bf6c87@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=c8166c541d3971bf6c87 Fixes: 2ba466d74ed7 ("nilfs2: directory entry operations") Tested-by: Ryusuke Konishi Cc: Signed-off-by: Andrew Morton diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index a002a44ff161..52e50b1b7f22 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -607,7 +607,7 @@ int nilfs_empty_dir(struct inode *inode) kaddr = nilfs_get_folio(inode, i, &folio); if (IS_ERR(kaddr)) - continue; + return 0; de = (struct nilfs_dir_entry *)kaddr; kaddr += nilfs_last_byte(inode, i) - NILFS_DIR_REC_LEN(1);