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

Commit 7d066459 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: make decode_ascii_ssetup void return 



...rc is always set to 0.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Acked-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent ffa598a5

fs/cifs/sess.c

+7 −11
Original line number Diff line number Diff line
@@ -310,11 +310,10 @@ decode_unicode_ssetup(char **pbcc_area, int bleft, struct cifs_ses *ses, 
	return;

}



static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft,

static void decode_ascii_ssetup(char **pbcc_area, __u16 bleft,

				struct cifs_ses *ses,

				const struct nls_table *nls_cp)

{

	int rc = 0;

	int len;

	char *bcc_ptr = *pbcc_area;
@@ -322,7 +321,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft, 


	len = strnlen(bcc_ptr, bleft);

	if (len >= bleft)

		return rc;

		return;



	kfree(ses->serverOS);
@@ -339,7 +338,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft, 


	len = strnlen(bcc_ptr, bleft);

	if (len >= bleft)

		return rc;

		return;



	kfree(ses->serverNOS);
@@ -352,7 +351,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft, 


	len = strnlen(bcc_ptr, bleft);

	if (len > bleft)

		return rc;

		return;



	/* No domain field in LANMAN case. Domain is

	   returned by old servers in the SMB negprot response */
@@ -360,8 +359,6 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft, 
	   but thus do return domain here we could add parsing

	   for it later, but it is not very important */

	cifs_dbg(FYI, "ascii: bytes left %d\n", bleft);



	return rc;

}



int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len,
@@ -938,8 +935,7 @@ CIFS_SessSetup(const unsigned int xid, struct cifs_ses *ses, 
		}

		decode_unicode_ssetup(&bcc_ptr, bytes_remaining, ses, nls_cp);

	} else {

		rc = decode_ascii_ssetup(&bcc_ptr, bytes_remaining,

					 ses, nls_cp);

		decode_ascii_ssetup(&bcc_ptr, bytes_remaining, ses, nls_cp);

	}



ssetup_exit: