Commit b438fcf1 authored by Steve French's avatar Steve French
Browse files

cifs: change confusing field serverName (to ip_addr) 



ses->serverName is not the server name, but the string form
of the ip address of the server.  Change the name to ip_addr
to avoid confusion (and fix the array length to match
maximum length of ipv6 address).

Reviewed-by: default avatarShyam Prasad N <sprasad@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent af982da9

fs/cifs/cifs_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
				(ses->serverOS == NULL) ||

				(ses->serverNOS == NULL)) {

				seq_printf(m, "\n\t%d) Name: %s Uses: %d Capability: 0x%x\tSession Status: %d ",

					i, ses->serverName, ses->ses_count,

					i, ses->ip_addr, ses->ses_count,

					ses->capabilities, ses->status);

				if (ses->session_flags & SMB2_SESSION_FLAG_IS_GUEST)

					seq_printf(m, "Guest ");
@@ -406,7 +406,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
				    "\n\t%d) Name: %s  Domain: %s Uses: %d OS: %s "

				    "\n\tNOS: %s\tCapability: 0x%x"

					"\n\tSMB session status: %d ",

				i, ses->serverName, ses->serverDomain,

				i, ses->ip_addr, ses->serverDomain,

				ses->ses_count, ses->serverOS, ses->serverNOS,

				ses->capabilities, ses->status);

			}

fs/cifs/cifsencrypt.c

+3 −3
Original line number Diff line number Diff line
@@ -568,15 +568,15 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 
			return rc;

		}

	} else {

		/* We use ses->serverName if no domain name available */

		len = strlen(ses->serverName);

		/* We use ses->ip_addr if no domain name available */

		len = strlen(ses->ip_addr);



		server = kmalloc(2 + (len * 2), GFP_KERNEL);

		if (server == NULL) {

			rc = -ENOMEM;

			return rc;

		}

		len = cifs_strtoUTF16((__le16 *)server, ses->serverName, len,

		len = cifs_strtoUTF16((__le16 *)server, ses->ip_addr, len,

					nls_cp);

		rc =

		crypto_shash_update(&ses->server->secmech.sdeschmacmd5->shash,

fs/cifs/cifsglob.h

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <linux/in.h>

#include <linux/in6.h>

#include <linux/inet.h>

#include <linux/slab.h>

#include <linux/mempool.h>

#include <linux/workqueue.h>
@@ -902,7 +903,7 @@ struct cifs_ses { 
	kuid_t linux_uid;	/* overriding owner of files on the mount */

	kuid_t cred_uid;	/* owner of credentials */

	unsigned int capabilities;

	char serverName[SERVER_NAME_LEN_WITH_NULL];

	char ip_addr[INET6_ADDRSTRLEN + 1]; /* Max ipv6 (or v4) addr string len */

	char *user_name;	/* must not be null except during init of sess

				   and after mount option parsing we fill it */

	char *domainName;

fs/cifs/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -1841,9 +1841,9 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx) 
	/* new SMB session uses our server ref */

	ses->server = server;

	if (server->dstaddr.ss_family == AF_INET6)

		sprintf(ses->serverName, "%pI6", &addr6->sin6_addr);

		sprintf(ses->ip_addr, "%pI6", &addr6->sin6_addr);

	else

		sprintf(ses->serverName, "%pI4", &addr->sin_addr);

		sprintf(ses->ip_addr, "%pI4", &addr->sin_addr);



	if (ctx->username) {

		ses->user_name = kstrdup(ctx->username, GFP_KERNEL);

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ int cifs_open(struct inode *inode, struct file *file) 
		} else if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {

			if (tcon->ses->serverNOS)

				cifs_dbg(VFS, "server %s of type %s returned unexpected error on SMB posix open, disabling posix open support. Check if server update available.\n",

					 tcon->ses->serverName,

					 tcon->ses->ip_addr,

					 tcon->ses->serverNOS);

			tcon->broken_posix_open = true;

		} else if ((rc != -EIO) && (rc != -EREMOTE) &&