Skip to content

Commit 4c38600

Browse files
pchelkin91gregkh
authored andcommitted
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
commit a09dc10 upstream. There are two places where ksmbd_vfs_kern_path_end_removing() needs to be called in order to balance what the corresponding successful call to ksmbd_vfs_kern_path_start_removing() has done, i.e. drop inode locks and put the taken references. Otherwise there might be potential deadlocks and unbalanced locks which are caught like: BUG: workqueue leaked lock or atomic: kworker/5:21/0x00000000/7596 last function: handle_ksmbd_work 2 locks held by kworker/5:21/7596: #0: ffff8881051ae448 (sb_writers#3){.+.+}-{0:0}, at: ksmbd_vfs_kern_path_locked+0x142/0x660 #1: ffff888130e966c0 (&type->i_mutex_dir_key#3/1){+.+.}-{4:4}, at: ksmbd_vfs_kern_path_locked+0x17d/0x660 CPU: 5 PID: 7596 Comm: kworker/5:21 Not tainted 6.1.162-00456-gc29b353f383b #138 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.17.0-debian-1.17.0-1 04/01/2014 Workqueue: ksmbd-io handle_ksmbd_work Call Trace: <TASK> dump_stack_lvl+0x44/0x5b process_one_work.cold+0x57/0x5c worker_thread+0x82/0x600 kthread+0x153/0x190 ret_from_fork+0x22/0x30 </TASK> Found by Linux Verification Center (linuxtesting.org). Fixes: d5fc140 ("smb/server: avoid deadlock when linking with ReplaceIfExists") Cc: stable@vger.kernel.org Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9bc3b0a commit 4c38600

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fs/smb/server/smb2pdu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6114,14 +6114,14 @@ static int smb2_create_link(struct ksmbd_work *work,
61146114
rc = -EINVAL;
61156115
ksmbd_debug(SMB, "cannot delete %s\n",
61166116
link_name);
6117-
goto out;
61186117
}
61196118
} else {
61206119
rc = -EEXIST;
61216120
ksmbd_debug(SMB, "link already exists\n");
6122-
goto out;
61236121
}
61246122
ksmbd_vfs_kern_path_end_removing(&path);
6123+
if (rc)
6124+
goto out;
61256125
}
61266126
rc = ksmbd_vfs_link(work, target_name, link_name);
61276127
if (rc)

0 commit comments

Comments
 (0)