Skip to content

Commit e37a75b

Browse files
szymonwilczekaalexandrovich
authored andcommitted
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Syzbot reported a task hung in ni_readpage_cmpr (now ni_read_folio_cmpr). This is caused by a lock inversion deadlock involving the inode mutex (ni_lock) and page locks. Scenario: 1. Task A enters ntfs_read_folio() for page X. It acquires ni_lock. 2. Task A calls ni_read_folio_cmpr(), which attempts to lock all pages in the compressed frame (including page Y). 3. Concurrently, Task B (e.g., via readahead) has locked page Y and calls ntfs_read_folio(). 4. Task B waits for ni_lock (held by A). 5. Task A waits for page Y lock (held by B). -> DEADLOCK. The fix is to restructure locking: do not take ni_lock in ntfs_read_folio(). Instead, acquire ni_lock inside ni_read_folio_cmpr() ONLY AFTER all required page locks for the frame have been successfully acquired. This restores the correct lock ordering (Page Lock -> ni_lock) consistent with VFS. Reported-by: syzbot+5af33dd272b913b65880@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=5af33dd272b913b65880 Fixes: f35590e ("fs/ntfs3: remove ntfs_bio_pages and use page cache for compressed I/O") Signed-off-by: Szymon Wilczek <swilczek.lx@gmail.com> [almaz.alexandrovich@paragon-software.com: ni_readpage_cmpr was renamed to ni_read_folio_cmpr] Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
1 parent c613269 commit e37a75b

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

fs/ntfs3/frecord.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,7 +2107,9 @@ int ni_read_folio_cmpr(struct ntfs_inode *ni, struct folio *folio)
21072107
pages[i] = pg;
21082108
}
21092109

2110+
ni_lock(ni);
21102111
err = ni_read_frame(ni, frame_vbo, pages, pages_per_frame, 0);
2112+
ni_unlock(ni);
21112113

21122114
out1:
21132115
for (i = 0; i < pages_per_frame; i++) {

fs/ntfs3/inode.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,9 +748,8 @@ static int ntfs_read_folio(struct file *file, struct folio *folio)
748748
}
749749

750750
if (is_compressed(ni)) {
751-
ni_lock(ni);
751+
/* ni_lock is taken inside ni_read_folio_cmpr after page locks */
752752
err = ni_read_folio_cmpr(ni, folio);
753-
ni_unlock(ni);
754753
return err;
755754
}
756755

0 commit comments

Comments
 (0)