]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
cifs: fix missing unload_nls() in smb2_reconnect()
authorPaulo Alcantara <pc@manguebit.com>
Fri, 24 Mar 2023 19:05:19 +0000 (16:05 -0300)
committerSteve French <stfrench@microsoft.com>
Fri, 24 Mar 2023 19:37:05 +0000 (14:37 -0500)
Make sure to unload_nls() @nls_codepage if we no longer need it.

Fixes: bc962159e8e3 ("cifs: avoid race conditions with parallel reconnects")
Signed-off-by: Paulo Alcantara (SUSE) <pc@manguebit.com>
Cc: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/cifs/smb2pdu.c

index a9fb95b7ef8292196970bdf1d4471338c85b98f2..20af1af34fa5d25518d9ae01368ffe0c9885cca5 100644 (file)
@@ -144,7 +144,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon,
               struct TCP_Server_Info *server)
 {
        int rc = 0;
-       struct nls_table *nls_codepage;
+       struct nls_table *nls_codepage = NULL;
        struct cifs_ses *ses;
 
        /*
@@ -220,8 +220,6 @@ again:
                 tcon->ses->chans_need_reconnect,
                 tcon->need_reconnect);
 
-       nls_codepage = load_nls_default();
-
        mutex_lock(&ses->session_mutex);
        /*
         * Recheck after acquire mutex. If another thread is negotiating
@@ -241,6 +239,8 @@ again:
        }
        spin_unlock(&server->srv_lock);
 
+       nls_codepage = load_nls_default();
+
        /*
         * need to prevent multiple threads trying to simultaneously
         * reconnect the same SMB session