Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ecaf67a authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: account for IPv6 in ses->serverName and clean up netbios name handling 



The current code for setting the session serverName is IPv4-specific.
Allow it to be an IPv6 address as well. Use NIP* macros to set the
format.

This also entails increasing the length of the serverName field, so
declare a new macro for RFC1001 name length and use it in the
appropriate places.

Finally, drop the unicode_server_Name field from TCP_Server_Info since
it's not used. We can add it back later if needed, but for now it just
wastes memory.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 954d7a1c

fs/cifs/cifsglob.h

+7 −4
Original line number Original line Diff line number Diff line
@@ -47,7 +47,11 @@ 
 */

 */

#define CIFS_MAX_REQ 50

#define CIFS_MAX_REQ 50





#define SERVER_NAME_LENGTH 15

#define RFC1001_NAME_LEN 15

#define RFC1001_NAME_LEN_WITH_NULL (RFC1001_NAME_LEN + 1)



/* currently length of NIP6_FMT */

#define SERVER_NAME_LENGTH 40

#define SERVER_NAME_LEN_WITH_NULL     (SERVER_NAME_LENGTH + 1)

#define SERVER_NAME_LEN_WITH_NULL     (SERVER_NAME_LENGTH + 1)





/* used to define string lengths for reversing unicode strings */

/* used to define string lengths for reversing unicode strings */
@@ -125,8 +129,7 @@ struct TCP_Server_Info { 
	struct list_head smb_ses_list;

	struct list_head smb_ses_list;

	int srv_count; /* reference counter */

	int srv_count; /* reference counter */

	/* 15 character server name + 0x20 16th byte indicating type = srv */

	/* 15 character server name + 0x20 16th byte indicating type = srv */

	char server_RFC1001_name[SERVER_NAME_LEN_WITH_NULL];

	char server_RFC1001_name[RFC1001_NAME_LEN_WITH_NULL];

	char unicode_server_Name[SERVER_NAME_LEN_WITH_NULL * 2];

	char *hostname; /* hostname portion of UNC string */

	char *hostname; /* hostname portion of UNC string */

	struct socket *ssocket;

	struct socket *ssocket;

	union {

	union {
@@ -171,7 +174,7 @@ struct TCP_Server_Info { 
	__u16 CurrentMid;         /* multiplex id - rotating counter */

	__u16 CurrentMid;         /* multiplex id - rotating counter */

	char cryptKey[CIFS_CRYPTO_KEY_SIZE];

	char cryptKey[CIFS_CRYPTO_KEY_SIZE];

	/* 16th byte of RFC1001 workstation name is always null */

	/* 16th byte of RFC1001 workstation name is always null */

	char workstation_RFC1001_name[SERVER_NAME_LEN_WITH_NULL];

	char workstation_RFC1001_name[RFC1001_NAME_LEN_WITH_NULL];

	__u32 sequence_number; /* needed for CIFS PDU signature */

	__u32 sequence_number; /* needed for CIFS PDU signature */

	struct mac_key mac_signing_key;

	struct mac_key mac_signing_key;

	char ntlmv2_hash[16];

	char ntlmv2_hash[16];

fs/cifs/connect.c

+26 −12
Original line number Original line Diff line number Diff line
@@ -1690,22 +1690,30 @@ ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket, 
		if (ses_init_buf) {

		if (ses_init_buf) {

			ses_init_buf->trailer.session_req.called_len = 32;

			ses_init_buf->trailer.session_req.called_len = 32;

			if (target_name && (target_name[0] != 0)) {

			if (target_name && (target_name[0] != 0)) {

				rfc1002mangle(ses_init_buf->trailer.session_req.called_name,

				rfc1002mangle(ses_init_buf->trailer.

					target_name, 16);

						session_req.called_name,

					      target_name,

					      RFC1001_NAME_LEN_WITH_NULL);

			} else {

			} else {

				rfc1002mangle(ses_init_buf->trailer.session_req.called_name,

				rfc1002mangle(ses_init_buf->trailer.

					DEFAULT_CIFS_CALLED_NAME, 16);

						session_req.called_name,

					      DEFAULT_CIFS_CALLED_NAME,

					      RFC1001_NAME_LEN_WITH_NULL);

			}

			}





			ses_init_buf->trailer.session_req.calling_len = 32;

			ses_init_buf->trailer.session_req.calling_len = 32;

			/* calling name ends in null (byte 16) from old smb

			/* calling name ends in null (byte 16) from old smb

			convention. */

			convention. */

			if (netbios_name && (netbios_name[0] != 0)) {

			if (netbios_name && (netbios_name[0] != 0)) {

				rfc1002mangle(ses_init_buf->trailer.session_req.calling_name,

				rfc1002mangle(ses_init_buf->trailer.

					netbios_name, 16);

						session_req.calling_name,

					      netbios_name,

					      RFC1001_NAME_LEN_WITH_NULL);

			} else {

			} else {

				rfc1002mangle(ses_init_buf->trailer.session_req.calling_name,

				rfc1002mangle(ses_init_buf->trailer.

					"LINUX_CIFS_CLNT", 16);

						session_req.calling_name,

					      "LINUX_CIFS_CLNT",

					      RFC1001_NAME_LEN_WITH_NULL);

			}

			}

			ses_init_buf->trailer.session_req.scope1 = 0;

			ses_init_buf->trailer.session_req.scope1 = 0;

			ses_init_buf->trailer.session_req.scope2 = 0;

			ses_init_buf->trailer.session_req.scope2 = 0;
@@ -2194,9 +2202,11 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, 
			}

			}

			rc = 0;

			rc = 0;

			memcpy(srvTcp->workstation_RFC1001_name,

			memcpy(srvTcp->workstation_RFC1001_name,

				volume_info.source_rfc1001_name, 16);

				volume_info.source_rfc1001_name,

				RFC1001_NAME_LEN_WITH_NULL);

			memcpy(srvTcp->server_RFC1001_name,

			memcpy(srvTcp->server_RFC1001_name,

				volume_info.target_rfc1001_name, 16);

				volume_info.target_rfc1001_name,

				RFC1001_NAME_LEN_WITH_NULL);

			srvTcp->sequence_number = 0;

			srvTcp->sequence_number = 0;

			INIT_LIST_HEAD(&srvTcp->tcp_ses_list);

			INIT_LIST_HEAD(&srvTcp->tcp_ses_list);

			INIT_LIST_HEAD(&srvTcp->smb_ses_list);

			INIT_LIST_HEAD(&srvTcp->smb_ses_list);
@@ -2235,7 +2245,11 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, 




		/* new SMB session uses our srvTcp ref */

		/* new SMB session uses our srvTcp ref */

		pSesInfo->server = srvTcp;

		pSesInfo->server = srvTcp;

		sprintf(pSesInfo->serverName, "%u.%u.%u.%u",

		if (addr.sa_family == AF_INET6)

			sprintf(pSesInfo->serverName, NIP6_FMT,

				NIP6(sin_server6->sin6_addr));

		else

			sprintf(pSesInfo->serverName, NIPQUAD_FMT,

				NIPQUAD(sin_server->sin_addr.s_addr));

				NIPQUAD(sin_server->sin_addr.s_addr));





		write_lock(&cifs_tcp_ses_lock);

		write_lock(&cifs_tcp_ses_lock);