Skip to content

Commit 96c23be

Browse files
konisSasha Levin
authored andcommitted
nilfs2: do not write dirty data after degenerating to read-only
commit 28a65b4 upstream. According to syzbot's report, mark_buffer_dirty() called from nilfs_segctor_do_construct() outputs a warning with some patterns after nilfs2 detects metadata corruption and degrades to read-only mode. After such read-only degeneration, page cache data may be cleared through nilfs_clear_dirty_page() which may also clear the uptodate flag for their buffer heads. However, even after the degeneration, log writes are still performed by unmount processing etc., which causes mark_buffer_dirty() to be called for buffer heads without the "uptodate" flag and causes the warning. Since any writes should not be done to a read-only file system in the first place, this fixes the warning in mark_buffer_dirty() by letting nilfs_segctor_do_construct() abort early if in read-only mode. This also changes the retry check of nilfs_segctor_write_out() to avoid unnecessary log write retries if it detects -EROFS that nilfs_segctor_do_construct() returned. Link: https://lkml.kernel.org/r/20230427011526.13457-1-konishi.ryusuke@gmail.com Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Tested-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Reported-by: syzbot+2af3bc9585be7f23f290@syzkaller.appspotmail.com Link: https://syzkaller.appspot.com/bug?extid=2af3bc9585be7f23f290 Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent efa8e0b commit 96c23be

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

fs/nilfs2/segment.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2044,6 +2044,9 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)
20442044
struct the_nilfs *nilfs = sci->sc_super->s_fs_info;
20452045
int err;
20462046

2047+
if (sb_rdonly(sci->sc_super))
2048+
return -EROFS;
2049+
20472050
nilfs_sc_cstage_set(sci, NILFS_ST_INIT);
20482051
sci->sc_cno = nilfs->ns_cno;
20492052

@@ -2729,7 +2732,7 @@ static void nilfs_segctor_write_out(struct nilfs_sc_info *sci)
27292732

27302733
flush_work(&sci->sc_iput_work);
27312734

2732-
} while (ret && retrycount-- > 0);
2735+
} while (ret && ret != -EROFS && retrycount-- > 0);
27332736
}
27342737

27352738
/**

0 commit comments

Comments
 (0)