nilfs2: fix BUG in nilfs_copy_dirty_pages() on dirty state mismatch
Ryusuke Konishi
maintainerPATCH 1/1 nilfs2: fix BUG in nilfs_copy_dirty_pages() on dirty state mismatch
Syzbot reported a kernel BUG triggered within nilfs_copy_dirty_pages(), which copies dirty DAT file folios/pages to its shadow page cache. The BUG occurs when a retrieved dirty folio/page unexpectedly loses its 'dirty' status.
This issue arises because, since the commit referenced below, the 'dirty' flag of a folio/page can be cleared asynchronously after the filesystem detects metadata corruption and transitions to read-only mode.
Resolve the issue by returning an -EROFS error if the filesystem has transitioned to read-only mode. Also change the behavior to issue a kernel warning only once instead of triggering a kernel BUG when this unexpected 'dirty' state is detected while the filesystem is not in read-only mode.
---
Viacheslav, please apply this for the next cycle.
This fixes an issue reported by syzbot where a kernel BUG could be triggered depending on timing after filesystem corruption is detected.
Thanks,
Ryusuke Konishi
fs/nilfs2/page.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
fs/nilfs2/page.c +15 -2
@@ -243,6 +243,7 @@ static void nilfs_copy_folio(struct folio *dst, struct folio *src,int nilfs_copy_dirty_pages (struct address_space *dmap,struct address_space *smap) { +struct inode *smap_inode = smap->host;struct folio_batch fbatch;unsigned int i;pgoff_t index =0 ;
@@ -258,8 +259,19 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,struct folio *folio = fbatch.folios[i], *dfolio;folio_lock (folio); -if (unlikely (!folio_test_dirty (folio))) -NILFS_FOLIO_BUG (folio,"inconsistent dirty state" ); +if (unlikely (!folio_test_dirty (folio))) { +if (WARN_ONCE (!sb_rdonly (smap_inode->i_sb), +"inconsistent dirty state\n" )) + goto unlock_folio; + +/* +* If the filesystem has been forced to read-only +* due to metadata corruption. +*/ +folio_unlock (folio); + err = -EROFS ; +break ; + } dfolio =filemap_grab_folio (dmap, folio->index);if (IS_ERR (dfolio)) {
@@ -277,6 +289,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,folio_unlock (dfolio);folio_put (dfolio); +unlock_folio:folio_unlock (folio); }folio_batch_release (&fbatch);
Signature · 1 line
2.43.0
Ryusuke Konishi
maintainerQuoted 75 lines · Ryusuke Konishi
Syzbot reported a kernel BUG triggered within
nilfs_copy_dirty_pages(), which copies dirty DAT file folios/pages to its shadow page cache. The BUG occurs when a retrieved dirty folio/page unexpectedly loses its 'dirty' status.This issue arises because, since the commit referenced below, the 'dirty' flag of a folio/page can be cleared asynchronously after the filesystem detects metadata corruption and transitions to read-only mode.
Resolve the issue by returning an
-EROFSerror if the filesystem has transitioned to read-only mode. Also change the behavior to issue a kernel warning only once instead of triggering a kernel BUG when this unexpected 'dirty' state is detected while the filesystem is not in read-only mode.Reported-by [email protected]Fixes 8c26c4e2694a ("nilfs2: fix issue with flush kernel thread after remount in RO mode because of driver's internal error or metadata corruption")Signed-off-by Ryusuke Konishi <[email protected]>---
Viacheslav, please apply this for the next cycle.This fixes an issue reported by syzbot where a kernel BUG could be triggered depending on timing after filesystem corruption is detected.
Thanks,
Ryusuke Konishifs/nilfs2/page.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)fs/nilfs2/page.c +15
-3@@ -243,6 +243,7 @@ static void nilfs_copy_folio(struct folio *dst, struct folio *src,int nilfs_copy_dirty_pages (struct address_space *dmap,struct address_space *smap) { +struct inode *smap_inode = smap->host;struct folio_batch fbatch;unsigned int i;pgoff_t index =0 ;@@ -258,8 +259,19 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,struct folio *folio = fbatch.folios[i], *dfolio;folio_lock (folio); -if (unlikely (!folio_test_dirty (folio))) -NILFS_FOLIO_BUG (folio,"inconsistent dirty state" ); +if (unlikely (!folio_test_dirty (folio))) { +if (WARN_ONCE (!sb_rdonly (smap_inode->i_sb), +"inconsistent dirty state\n" )) + goto unlock_folio; + +/* +* If the filesystem has been forced to read-only +* due to metadata corruption. +*/ +folio_unlock (folio); + err = -EROFS ; +break ; + } dfolio =filemap_grab_folio (dmap, folio->index);if (IS_ERR (dfolio)) {@@ -277,6 +289,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,folio_unlock (dfolio);folio_put (dfolio); +unlock_folio:folio_unlock (folio); }folio_batch_release (&fbatch); --
Quoted 2 lines
2.43.0
Hi Viacheslav,
Sorry for the disturbance while you are busy.
Could you please pick up the following four pending patches - including this one - for the next cycle at your convenience? Excluding those already applied, these are the ones submitted by me or requested for direct pick-up since the weekend before last:
- [PATCH] nilfs2: fix slab-out-of-bounds in nilfs_direct_propagate after truncation
- [PATCH v2] nilfs2: fix infinite loop in nilfs_clean_segments()
- [PATCH] nilfs2: prevent out-of-bounds read in super root block parsing
- [PATCH] nilfs2: fix BUG in nilfs_copy_dirty_pages() on dirty state mismatch
Thanks,
Ryusuke Konishi
Viacheslav Dubeyko
maintainerHi Ryusuke,
Quoted 13 lines · Ryusuke Konishi
Quoted 1 line
Hi Viacheslav,
Sorry for the disturbance while you are busy.
Could you please pick up the following four pending patches - including this one - for the next cycle at your convenience? Excluding those already applied, these are the ones submitted by me or
requested for direct pick-up since the weekend before last:
Quoted 9 lines
- [PATCH] nilfs2: fix slab-out-of-bounds in
nilfs_direct_propagateafter truncation
- [PATCH v2] nilfs2: fix infinite loop innilfs_clean_segments()
- [PATCH] nilfs2: prevent out-of-bounds read in super root block parsing
- [PATCH] nilfs2: fix BUG innilfs_copy_dirty_pages()on dirty state mismatch
Sorry, I think it was a glitch of the email client on my side. Let me apply the patches. I've missed it.
Thanks,
Slava.
Quoted 79 lines · Ryusuke Konishi
Syzbot reported a kernel BUG triggered within
nilfs_copy_dirty_pages(),
which copies dirty DAT file folios/pages to its shadow page cache. The
BUG occurs when a retrieved dirty folio/page unexpectedly loses its 'dirty' status.This issue arises because, since the commit referenced below, the 'dirty'
flag of a folio/page can be cleared asynchronously after the filesystem
detects metadata corruption and transitions to read-only mode.Resolve the issue by returning an
-EROFSerror if the filesystem has transitioned to read-only mode. Also change the behavior to issue a kernel warning only once instead of triggering a kernel BUG when this unexpected 'dirty' state is detected while the filesystem is not in read-only mode.Reported-by [email protected]Fixes 8c26c4e2694a ("nilfs2: fix issue with flush kernel threadafter remount in RO mode because of driver's internal error or metadata corruption")
Signed-off-by Ryusuke Konishi <[email protected]>---
Viacheslav, please apply this for the next cycle.This fixes an issue reported by syzbot where a kernel BUG could be triggered depending on timing after filesystem corruption is detected.
Thanks,
Ryusuke Konishifs/nilfs2/page.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)fs/nilfs2/page.c +1
-0@@ -243,6 +243,7 @@ static void nilfs_copy_folio(struct folio *dst,struct folio *src, int nilfs_copy_dirty_pages(struct address_space *dmap, struct address_space *smap) { + struct inode *smap_inode = smap->host; struct folio_batch fbatch; unsigned int i;
pgoff_tindex = 0;fs/nilfs2/page.c +0
-0@@ -258,8 +259,19 @@ int nilfs_copy_dirty_pages(struct address_space *dmap, struct folio *folio = fbatch.folios[i], *dfolio;
folio_lock(folio);fs/nilfs2/page.c +0
-2-if (unlikely (!folio_test_dirty (folio))) - NILFS_FOLIO_BUG(folio, "inconsistent dirtystate");
fs/nilfs2/page.c +3
-0+if (unlikely (!folio_test_dirty (folio))) { + if (WARN_ONCE(!sb_rdonly(smap_inode->i_sb), + "inconsistent dirtystate\n"))
fs/nilfs2/page.c +4
-0+ goto unlock_folio; + +/* +* If the filesystem has been forced to read-only
fs/nilfs2/page.c +6
-0+* due to metadata corruption. +*/ +folio_unlock (folio); + err = -EROFS ; +break ; + }
dfolio =filemap_grab_folio(dmap, folio->index); if (IS_ERR(dfolio)) {fs/nilfs2/page.c +0
-0@@ -277,6 +289,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,
Quoted 7 lines
folio_unlock(dfolio);
folio_put(dfolio);
+unlock_folio:
folio_unlock(folio);
}
folio_batch_release(&fbatch);
Applied.
Thanks,
Slava.