Skip to content

Commit 033bc52

Browse files
konisgregkh
authored andcommitted
nilfs2: fix kernel bug due to missing clearing of buffer delay flag
commit 6ed469d upstream. Syzbot reported that after nilfs2 reads a corrupted file system image and degrades to read-only, the BUG_ON check for the buffer delay flag in submit_bh_wbc() may fail, causing a kernel bug. This is because the buffer delay flag is not cleared when clearing the buffer state flags to discard a page/folio or a buffer head. So, fix this. This became necessary when the use of nilfs2's own page clear routine was expanded. This state inconsistency does not occur if the buffer is written normally by log writing. Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Link: https://lore.kernel.org/r/20241015213300.7114-1-konishi.ryusuke@gmail.com Fixes: 8c26c4e ("nilfs2: fix issue with flush kernel thread after remount in RO mode because of driver's internal error or metadata corruption") Reported-by: syzbot+985ada84bf055a575c07@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=985ada84bf055a575c07 Cc: stable@vger.kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 437885a commit 033bc52

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

fs/nilfs2/page.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ void nilfs_forget_buffer(struct buffer_head *bh)
7878
const unsigned long clear_bits =
7979
(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |
8080
BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |
81-
BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));
81+
BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |
82+
BIT(BH_Delay));
8283

8384
lock_buffer(bh);
8485
set_mask_bits(&bh->b_state, clear_bits, 0);
@@ -412,7 +413,8 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)
412413
const unsigned long clear_bits =
413414
(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |
414415
BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |
415-
BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));
416+
BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |
417+
BIT(BH_Delay));
416418

417419
bh = head = page_buffers(page);
418420
do {

0 commit comments

Comments
 (0)