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

Commit 313fecfa authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: add cFYI messages with some of the saved strings from ssetup/tcon 



...to make it easier to find problems in this area in the future.

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

fs/cifs/connect.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -3757,11 +3757,14 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, 
				kfree(tcon->nativeFileSystem);

				kfree(tcon->nativeFileSystem);

				tcon->nativeFileSystem =

				tcon->nativeFileSystem =

				    kzalloc((4 * length) + 2, GFP_KERNEL);

				    kzalloc((4 * length) + 2, GFP_KERNEL);

				if (tcon->nativeFileSystem)

				if (tcon->nativeFileSystem) {

					cifs_strfromUCS_le(

					cifs_strfromUCS_le(

						tcon->nativeFileSystem,

						tcon->nativeFileSystem,

						(__le16 *) bcc_ptr,

						(__le16 *) bcc_ptr,

						length, nls_codepage);

						length, nls_codepage);

					cFYI(1, ("nativeFileSystem=%s",

						tcon->nativeFileSystem));

				}

				bcc_ptr += (2 * length) + 2;

				bcc_ptr += (2 * length) + 2;

			}

			}

			/* else do not bother copying these information fields*/

			/* else do not bother copying these information fields*/

fs/cifs/sess.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -311,8 +311,10 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft, 
	kfree(ses->serverOS);

	kfree(ses->serverOS);

	/* UTF-8 string will not grow more than four times as big as UCS-16 */

	/* UTF-8 string will not grow more than four times as big as UCS-16 */

	ses->serverOS = kzalloc((4 * len) + 2 /* trailing null */, GFP_KERNEL);

	ses->serverOS = kzalloc((4 * len) + 2 /* trailing null */, GFP_KERNEL);

	if (ses->serverOS != NULL)

	if (ses->serverOS != NULL) {

		cifs_strfromUCS_le(ses->serverOS, (__le16 *)data, len, nls_cp);

		cifs_strfromUCS_le(ses->serverOS, (__le16 *)data, len, nls_cp);

		cFYI(1, ("serverOS=%s", ses->serverOS));

	}

	data += 2 * (len + 1);

	data += 2 * (len + 1);

	words_left -= len + 1;

	words_left -= len + 1;
@@ -327,6 +329,7 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft, 
	if (ses->serverNOS != NULL) {

	if (ses->serverNOS != NULL) {

		cifs_strfromUCS_le(ses->serverNOS, (__le16 *)data, len,

		cifs_strfromUCS_le(ses->serverNOS, (__le16 *)data, len,

				   nls_cp);

				   nls_cp);

		cFYI(1, ("serverNOS=%s", ses->serverNOS));

		if (strncmp(ses->serverNOS, "NT LAN Manager 4", 16) == 0) {

		if (strncmp(ses->serverNOS, "NT LAN Manager 4", 16) == 0) {

			cFYI(1, ("NT4 server"));

			cFYI(1, ("NT4 server"));

			ses->flags |= CIFS_SES_NT4;

			ses->flags |= CIFS_SES_NT4;
@@ -343,9 +346,11 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft, 




	kfree(ses->serverDomain);

	kfree(ses->serverDomain);

	ses->serverDomain = kzalloc((4 * len) + 2, GFP_KERNEL);

	ses->serverDomain = kzalloc((4 * len) + 2, GFP_KERNEL);

	if (ses->serverDomain != NULL)

	if (ses->serverDomain != NULL) {

		cifs_strfromUCS_le(ses->serverDomain, (__le16 *)data, len,

		cifs_strfromUCS_le(ses->serverDomain, (__le16 *)data, len,

				   nls_cp);

				   nls_cp);

		cFYI(1, ("serverDomain=%s", ses->serverDomain));

	}

	data += 2 * (len + 1);

	data += 2 * (len + 1);

	words_left -= len + 1;

	words_left -= len + 1;