]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
smb/server: avoid deadlock when linking with ReplaceIfExists
authorNeilBrown <neil@brown.name>
Sun, 8 Jun 2025 23:35:09 +0000 (09:35 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:40:54 +0000 (18:40 +0200)
[ Upstream commit d5fc1400a34b4ea5e8f2ce296ea12bf8c8421694 ]

If smb2_create_link() is called with ReplaceIfExists set and the name
does exist then a deadlock will happen.

ksmbd_vfs_kern_path_locked() will return with success and the parent
directory will be locked.  ksmbd_vfs_remove_file() will then remove the
file.  ksmbd_vfs_link() will then be called while the parent is still
locked.  It will try to lock the same parent and will deadlock.

This patch moves the ksmbd_vfs_kern_path_unlock() call to *before*
ksmbd_vfs_link() and then simplifies the code, removing the file_present
flag variable.

Signed-off-by: NeilBrown <neil@brown.name>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/smb/server/smb2pdu.c

index a760785aa1ec7e80ae26a54af41fd1f0876de0c2..e5c469a87d64c0e3553627565ba40a0941104c42 100644 (file)
@@ -6063,7 +6063,6 @@ static int smb2_create_link(struct ksmbd_work *work,
 {
        char *link_name = NULL, *target_name = NULL, *pathname = NULL;
        struct path path, parent_path;
-       bool file_present = false;
        int rc;
 
        if (buf_len < (u64)sizeof(struct smb2_file_link_info) +
@@ -6096,11 +6095,8 @@ static int smb2_create_link(struct ksmbd_work *work,
        if (rc) {
                if (rc != -ENOENT)
                        goto out;
-       } else
-               file_present = true;
-
-       if (file_info->ReplaceIfExists) {
-               if (file_present) {
+       } else {
+               if (file_info->ReplaceIfExists) {
                        rc = ksmbd_vfs_remove_file(work, &path);
                        if (rc) {
                                rc = -EINVAL;
@@ -6108,21 +6104,17 @@ static int smb2_create_link(struct ksmbd_work *work,
                                            link_name);
                                goto out;
                        }
-               }
-       } else {
-               if (file_present) {
+               } else {
                        rc = -EEXIST;
                        ksmbd_debug(SMB, "link already exists\n");
                        goto out;
                }
+               ksmbd_vfs_kern_path_unlock(&parent_path, &path);
        }
-
        rc = ksmbd_vfs_link(work, target_name, link_name);
        if (rc)
                rc = -EINVAL;
 out:
-       if (file_present)
-               ksmbd_vfs_kern_path_unlock(&parent_path, &path);
 
        if (!IS_ERR(link_name))
                kfree(link_name);