From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794316371; b=Fst7XPLOvVPFQws8+4zaBtwtaJmTtcrXaDp9FVkLbEomY/aILAhlXZTRXhrorjEWK2oI FylEt2cZAnui0QXb8FVlsNAIzV75NZz6Q0vpUaezoEKSG4BEw7mK/yqdxGKEY/k1xtE6q OW+PnBCUR9pLyjyLKuV1U1pjdwd/M33fFWvPIXT2Mq9NBXL2st0kq5RPUi8tZhDw4qVa4 yXR/mUFKgBhknVwr68kA51rUFzyDMg/t+1J7XCERzQCZlPfJ+DAJAiPYUhlcI6Llt4Ll8 UR6xKlclB5XSnl/+UhD5T4kW2s4joSEwmShD7fzBXCC7vBvUTKtqlu+BpCkAIW8hPWA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794316371; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=x3G/1dWSanuCh2znKOZE4hJwvGzccws0I8asBjE7hUU=; b=AX+ggc7+bd7H9FYTp8PvJF6B8gdpUWRoQm5YfA9iA7zJCDsjegHyrcPiVZonldwjQlts tY+045/GHTfvu93UqTNzk3pXgI86QbxFpwoESCOXzmbW4PiGjnnCgJQGt16NNkzbMxf4c xil/wPxrkfvnOLcCOEEr03NUZ/qfGQtaKk5/Pj2hQQryJXm/WIQ6LeFj1k0fhSRwuQIUk TgzwllVV7coC5rW2pE2/ZJJ3+uNJWfUryGKDTDqQK6jrrYhvSSE//Xx8ThH35U71AqvKK IbJ7gH8D5j6aM8Qjl+PgQk3qTJ3tFo+OB/p7YHG0aL6P0/dSiezmx6NhhWjKwp+axjw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=dqcPHWlu; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40DE6606A7DF for ; Tue, 10 Nov 2026 13:12:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=dqcPHWlu Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26F081F008A1; Tue, 10 Nov 2026 13:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794316370; bh=x3G/1dWSanuCh2znKOZE4hJwvGzccws0I8asBjE7hUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dqcPHWluMkAqfn12GGr2E7iQ1ctehToKkqS85AUo6V7SHk+ioW7etb71OLkwNch1I XQXTM0TcCuvBzvpeZDlaBo/CMTuLdPSN3RvIASlwE/WShYNH57TY3VbfdVIs7RGugo hxi7CPodjePJrMDMD1bUsISi3kusiaofIEI6VcvrL/3AhDlr15+K0plT+ZTvz26NW7 WXV4YhlRitADysIh0lrUg6qHx4E1T2CW6iIDPQs3RM+zo8na78Cs85GhMETgYge3GS p9ytIXR1Js2kMzjh7qFiroxMcREwsjOn+NbOtLdRT5niPhn29elXuaxYQJ+IWw/vTZ 6+v/NYbK+piWQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Ryusuke Konishi , syzbot+f6c7e1f1809f235eeb90@syzkaller.appspotmail.com, Wang Jianjian , Viacheslav Dubeyko , Sasha Levin Subject: [PATCH 6.12.y 2/2] nilfs2: ignore non-fatal signals during synchronous log write wait Date: Tue, 10 Nov 2026 08:12:48 -0500 Message-ID: <20261110131241.1664282-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110131241.1664282-1-sashal@kernel.org> References: <20261107051820-failed-6.12-7131aaa74bcc@kernel.org> <20261110131241.1664282-1-sashal@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ryusuke Konishi [ Upstream commit 7131aaa74bcc7c9da1f1d1c8724da75c775557a0 ] Based on a syzbot report, Wang Jianjian pointed out that following a successful directory operation in nilfs_rename(), a synchronous write requested within nilfs_transaction_commit(), triggered by a sync flag set by nilfs_commit_chunk(), could be interrupted by a user signal. This interruption leaves in-memory metadata updates intact while returning an error, causing inconsistency with the VFS dentry cache and ultimately triggering a kernel warning. According to "signal(7)", local disks are not classified as "slow devices" (such as terminals, FIFOs, or pipes) and their I/O operations on disk devices are not interrupted by signals. In kernel space, waiting for such disk I/O should therefore not be aborted by ordinary (non-fatal) signals. Suppress this issue by modifying nilfs_segctor_sync(), which waits for the log writer thread to complete synchronous writes, to catch only fatal signals via fatal_signal_pending() and return -EINTR rather than -ERESTARTSYS. To complement this change and prevent the wait loop from busy-looping when schedule() returns immediately due to a pending non-fatal signal, switch the wait state from TASK_INTERRUPTIBLE to TASK_KILLABLE. This serves as an effective interim stabilization measure without structural changes until a comprehensive fix for metadata consistency is implemented. Reported-by: syzbot+f6c7e1f1809f235eeb90@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=f6c7e1f1809f235eeb90 Fixes: 9ff05123e3bf ("nilfs2: segment constructor") Tested-by: syzbot+f6c7e1f1809f235eeb90@syzkaller.appspotmail.com Cc: Wang Jianjian Cc: stable@vger.kernel.org Signed-off-by: Ryusuke Konishi Signed-off-by: Viacheslav Dubeyko Signed-off-by: Sasha Levin --- fs/nilfs2/ioctl.c | 2 +- fs/nilfs2/recovery.c | 2 +- fs/nilfs2/segment.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 03062b6bc3238..11ccf18c3999f 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c @@ -972,10 +972,10 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, * Return: 0 on success, or one of the following negative error codes on * failure: * * %-EFAULT - Failure during execution of requested operation. + * * %-EINTR - Interrupted. * * %-EIO - I/O error. * * %-ENOMEM - Insufficient memory available. * * %-ENOSPC - No space left on device (only in a panic state). - * * %-ERESTARTSYS - Interrupted. * * %-EROFS - Read only filesystem. */ static int nilfs_ioctl_sync(struct inode *inode, struct file *filp, diff --git a/fs/nilfs2/recovery.c b/fs/nilfs2/recovery.c index fe98424ac465f..e6e044f8f7b81 100644 --- a/fs/nilfs2/recovery.c +++ b/fs/nilfs2/recovery.c @@ -759,11 +759,11 @@ static void nilfs_abort_roll_forward(struct the_nilfs *nilfs) * * Return: 0 on success, or one of the following negative error codes on * failure: + * * %-EINTR - Interrupted. * * %-EINVAL - Inconsistent filesystem state. * * %-EIO - I/O error. * * %-ENOMEM - Insufficient memory available. * * %-ENOSPC - No space left on device (only in a panic state). - * * %-ERESTARTSYS - Interrupted. */ int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs, struct super_block *sb, diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index c5ddbdbb2f427..9da544759f10f 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2264,7 +2264,7 @@ static int nilfs_segctor_sync(struct nilfs_sc_info *sci) wake_up(&sci->sc_wait_daemon); for (;;) { - set_current_state(TASK_INTERRUPTIBLE); + set_current_state(TASK_KILLABLE); /* * Synchronize only while the log writer thread is alive. @@ -2278,11 +2278,11 @@ static int nilfs_segctor_sync(struct nilfs_sc_info *sci) err = wait_req.err; break; } - if (!signal_pending(current)) { + if (!fatal_signal_pending(current)) { schedule(); continue; } - err = -ERESTARTSYS; + err = -EINTR; break; } finish_wait(&sci->sc_wait_request, &wait_req.wq); @@ -2316,10 +2316,10 @@ static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err, bool force) * * Return: 0 on success, or one of the following negative error codes on * failure: + * * %-EINTR - Interrupted. * * %-EIO - I/O error (including metadata corruption). * * %-ENOMEM - Insufficient memory available. * * %-ENOSPC - No space left on device (only in a panic state). - * * %-ERESTARTSYS - Interrupted. * * %-EROFS - Read only filesystem. */ int nilfs_construct_segment(struct super_block *sb) @@ -2346,10 +2346,10 @@ int nilfs_construct_segment(struct super_block *sb) * * Return: 0 on success, or one of the following negative error codes on * failure: + * * %-EINTR - Interrupted. * * %-EIO - I/O error (including metadata corruption). * * %-ENOMEM - Insufficient memory available. * * %-ENOSPC - No space left on device (only in a panic state). - * * %-ERESTARTSYS - Interrupted. * * %-EROFS - Read only filesystem. */ int nilfs_construct_dsync_segment(struct super_block *sb, struct inode *inode, -- 2.53.0