From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 7905CCA6F; Sat, 12 Sep 2026 10:20:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789208454; cv=none; b=T6cmJ6HE8e/6ckWFC7mlgLmcbijNm2OFg6dIZ3Z+bQN81REbW6jnJ9F/YrzM9hHNHJUcpcDeTGQP/K3BRhld5JwQwVx5CGf6NOnbLFo5W9H12vLyKdlpwNva2m0i3hzVR3iIogQTHGwWj8Rx7BO639BGXI189ybduZXiECvCwWw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789208454; c=relaxed/simple; bh=qtaNi6CNuEedL+//BsSOGqxeO8ASapHsToP2fGAO224=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fRmxiTE7260Hhr/CK+jZ3vm9IpyP+xh+K2s0AZXJbrO3f0vldQ2WP2PV+q6WQfZg5yGbnf7rfcJwpQK1In+ZVIHA3zwVBSp9P3p37x2dAE874NPtSgQyfQ288wDq+nWTqkQXgbhDgJ7zWb0Nf2XBmovLrqyJ/8JEED2vji3Ke4I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fKRMfqYx; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fKRMfqYx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 389D21F000FF; Sat, 12 Sep 2026 10:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789208453; bh=CR7H38AwmklpFXEO4biSkdNZryHdNAqex8OTYTp2usU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fKRMfqYxPxyVBq7uimDgo3rqvatGIq/bWrLJKmXLbJ8I6HS6mL/DlyVTPtb4yLtNJ y5knsUYpgMJoMQhIu6mi90YzTnl/1VIizpDDmTwswocgUowQDF2fjK7D0bvmaSYnMs 1So0/VL+V6HAwFN7lS0OsKzgBwfcknMV0PTcD6Ws= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+cae54346a70bbceeff2c@syzkaller.appspotmail.com, Joshua Crofts , Ryusuke Konishi , Viacheslav Dubeyko , Sasha Levin Subject: [PATCH 6.18 0620/1518] nilfs2: fix infinite loop in nilfs_clean_segments() Date: Sat, 12 Sep 2026 08:46:29 +0200 Message-ID: <20260912065637.455029594@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joshua Crofts [ Upstream commit ce5a5ad1a8330a2fcfdd9ec2ab341be739e89a18 ] syzbot reported a hung task in nilfs_transaction_begin(). This occurs because the cleaner ioctl falls into an infinite loop if nilfs_segctor_construct() repeatedly returns -EROFS (e.g. the device is remounted as read-only after an I/O error). Currently in nilfs_clean_segments(), if err is non-zero, it logs the error and sleeps but doesn't abort when it encounters a terminal error like -EROFS. This causes the thread to loop forever. Fix this by breaking out of the loop if nilfs_segctor_construct() returns -EROFS. This matches the behaviour in nilfs_segctor_write_out(), which also handles -EROFS. Reported-by: syzbot+cae54346a70bbceeff2c@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=cae54346a70bbceeff2c Fixes: 9ff05123e3bf ("nilfs2: segment constructor") Assisted-by: gemini:gemini-3.1-pro Signed-off-by: Joshua Crofts Acked-by: Ryusuke Konishi Signed-off-by: Viacheslav Dubeyko Signed-off-by: Sasha Levin --- fs/nilfs2/segment.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 0bc1f0f02f31d..c20340f4e0dc3 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2561,6 +2561,10 @@ int nilfs_clean_segments(struct super_block *sb, struct nilfs_argv *argv, break; nilfs_warn(sb, "error %d cleaning segments", err); + + if (unlikely(err == -EROFS)) + goto out_unlock; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(sci->sc_interval); } -- 2.53.0