]> git.baikalelectronics.ru Git - kernel.git/commitdiff
cifs: update cifs_ses::ip_addr after failover
authorPaulo Alcantara <pc@cjr.nz>
Fri, 24 Jun 2022 18:01:43 +0000 (15:01 -0300)
committerSteve French <stfrench@microsoft.com>
Fri, 24 Jun 2022 18:34:28 +0000 (13:34 -0500)
cifs_ses::ip_addr wasn't being updated in cifs_session_setup() when
reconnecting SMB sessions thus returning wrong value in
/proc/fs/cifs/DebugData.

Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Cc: stable@kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/cifs/connect.c

index 8d56325915d0f89c70715fad3c5043435bd26c30..fa29c9aae24bc2c073b88704d87788256975d905 100644 (file)
@@ -4025,10 +4025,16 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses,
                   struct nls_table *nls_info)
 {
        int rc = -ENOSYS;
+       struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&server->dstaddr;
+       struct sockaddr_in *addr = (struct sockaddr_in *)&server->dstaddr;
        bool is_binding = false;
 
-
        spin_lock(&cifs_tcp_ses_lock);
+       if (server->dstaddr.ss_family == AF_INET6)
+               scnprintf(ses->ip_addr, sizeof(ses->ip_addr), "%pI6", &addr6->sin6_addr);
+       else
+               scnprintf(ses->ip_addr, sizeof(ses->ip_addr), "%pI4", &addr->sin_addr);
+
        if (ses->ses_status != SES_GOOD &&
            ses->ses_status != SES_NEW &&
            ses->ses_status != SES_NEED_RECON) {