OSDN Git Service

cifs: Fix connections leak when tlink setup failed
authorZhang Xiaoxu <zhangxiaoxu5@huawei.com>
Fri, 11 Nov 2022 07:12:12 +0000 (15:12 +0800)
committerSteve French <stfrench@microsoft.com>
Fri, 11 Nov 2022 17:59:30 +0000 (11:59 -0600)
If the tlink setup failed, lost to put the connections, then
the module refcnt leak since the cifsd kthread not exit.

Also leak the fscache info, and for next mount with fsc, it will
print the follow errors:
  CIFS: Cache volume key already in use (cifs,127.0.0.1:445,TEST)

Let's check the result of tlink setup, and do some cleanup.

Fixes: 56c762eb9bee ("cifs: Refactor out cifs_mount()")
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/cifs/connect.c

index 1cc47dd..9db9527 100644 (file)
@@ -3855,9 +3855,13 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx)
        uuid_copy(&cifs_sb->dfs_mount_id, &mnt_ctx.mount_id);
 
 out:
-       free_xid(mnt_ctx.xid);
        cifs_try_adding_channels(cifs_sb, mnt_ctx.ses);
-       return mount_setup_tlink(cifs_sb, mnt_ctx.ses, mnt_ctx.tcon);
+       rc = mount_setup_tlink(cifs_sb, mnt_ctx.ses, mnt_ctx.tcon);
+       if (rc)
+               goto error;
+
+       free_xid(mnt_ctx.xid);
+       return rc;
 
 error:
        dfs_cache_put_refsrv_sessions(&mnt_ctx.mount_id);
@@ -3884,8 +3888,12 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx)
                        goto error;
        }
 
+       rc = mount_setup_tlink(cifs_sb, mnt_ctx.ses, mnt_ctx.tcon);
+       if (rc)
+               goto error;
+
        free_xid(mnt_ctx.xid);
-       return mount_setup_tlink(cifs_sb, mnt_ctx.ses, mnt_ctx.tcon);
+       return rc;
 
 error:
        mount_put_conns(&mnt_ctx);