Skip to content

Commit 7bf1823

Browse files
donutAneesakpm00
authored andcommitted
ocfs2: fix deadlock in ocfs2_get_system_file_inode
syzbot has found a possible deadlock in ocfs2_get_system_file_inode [1]. The scenario is depicted here, CPU0 CPU1 lock(&ocfs2_file_ip_alloc_sem_key); lock(&osb->system_file_mutex); lock(&ocfs2_file_ip_alloc_sem_key); lock(&osb->system_file_mutex); The function calls which could lead to this are: CPU0 ocfs2_mknod - lock(&ocfs2_file_ip_alloc_sem_key); . . . ocfs2_get_system_file_inode - lock(&osb->system_file_mutex); CPU1 - ocfs2_fill_super - lock(&osb->system_file_mutex); . . . ocfs2_read_virt_blocks - lock(&ocfs2_file_ip_alloc_sem_key); This issue can be resolved by making the down_read -> down_read_try in the ocfs2_read_virt_blocks. [1] https://syzkaller.appspot.com/bug?extid=e0055ea09f1f5e6fabdd Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Mohammed Anees <[email protected]> Reviewed-by: Joseph Qi <[email protected]> Reported-by: <[email protected]> Closes: https://syzkaller.appspot.com/bug?extid=e0055ea09f1f5e6fabdd Tested-by: [email protected] Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Cc: Junxiao Bi <[email protected]> Cc: Changwei Ge <[email protected]> Cc: Gang He <[email protected]> Cc: Jun Piao <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 5ca60b8 commit 7bf1823

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

fs/ocfs2/extent_map.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,13 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr,
973973
}
974974

975975
while (done < nr) {
976-
down_read(&OCFS2_I(inode)->ip_alloc_sem);
976+
if (!down_read_trylock(&OCFS2_I(inode)->ip_alloc_sem)) {
977+
rc = -EAGAIN;
978+
mlog(ML_ERROR,
979+
"Inode #%llu ip_alloc_sem is temporarily unavailable\n",
980+
(unsigned long long)OCFS2_I(inode)->ip_blkno);
981+
break;
982+
}
977983
rc = ocfs2_extent_map_get_blocks(inode, v_block + done,
978984
&p_block, &p_count, NULL);
979985
up_read(&OCFS2_I(inode)->ip_alloc_sem);

0 commit comments

Comments
 (0)