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 6187A32B125; Sat, 12 Sep 2026 16:25:56 +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=1789230357; cv=none; b=JpiIIH9HMIxa4+V27Rq+H7qTYWa8abuGnina8UDAsdhhY+g7DRWmj5Zi2szsrnZlfTlMcu7V4avuNUgiIOBaYoI2l3OJJuXpvKrBajtb4vNld02RA500Yt0ATjbtuSowb3EyHLOA3+65Yg/5KXRB+FlCeYrnzHkhjEN2vDs1Pqk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789230357; c=relaxed/simple; bh=lT+4YDxtw0evGCBacg9AMlAXFNl/0U27WsGuvNQSnlg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oDRPIu0J6OqFgLaES0uTzq4sbf/mTTzQLtJ4PVWOMxNZn+3zMw/GRR+xtm8BWs4oVIVG7conYaJMDldq3BstsgPNL1I1LYEuRm8rSZeKFxneIkpTj3MonaYyfwnfjWEaXtXablvOjVYQzMq3Tjk15sRQt3xKW+Z5XeXk9Sy+2es= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=stKO0xwy; 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="stKO0xwy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31E5F1F000FF; Sat, 12 Sep 2026 16:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789230356; bh=HOcj4C6NefObCTV1glgf7471eKdYM2mnD4YPYALnA08=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=stKO0xwyBEEr9+NAmx4EUc96JxOsZEzPkRW9SDGBBQc0ChpxAmoGdGQ3UCf+cpkOm 5eYuaeZf0NYbgIN4FLGvPrBJS8JwNXLpQNgW8LeyMz+MBfJWOx168LrTQA0LNAeZ7Y JwAbepO+MWWM4WZd2ZOjCMOskYzreWyAOL6U+DIQ= 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.1 0740/1191] nilfs2: fix infinite loop in nilfs_clean_segments() Date: Sat, 12 Sep 2026 08:57:48 +0200 Message-ID: <20260912065604.903337216@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@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.1-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 12e55e9c698a9..a412abdfbbf3e 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2552,6 +2552,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