UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

cifs: make decode_ascii_ssetup void return 

...rc is always set to 0.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Jeff Layton 2013-05-24 07:41:00 -04:00 committed by Steve French
parent ffa598a537
commit 7d06645969
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/cifs/sess.c
View File

@ -310,11 +310,10 @@ decode_unicode_ssetup(char **pbcc_area, int bleft, struct cifs_ses *ses,
return; 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, struct cifs_ses *ses,
const struct nls_table *nls_cp) const struct nls_table *nls_cp)
{ {
int rc = 0;
int len; int len;
char *bcc_ptr = *pbcc_area; char *bcc_ptr = *pbcc_area;
@ -322,7 +321,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft,
len = strnlen(bcc_ptr, bleft); len = strnlen(bcc_ptr, bleft);
if (len >= bleft) if (len >= bleft)
return rc; return;
kfree(ses->serverOS); kfree(ses->serverOS);
@ -339,7 +338,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft,
len = strnlen(bcc_ptr, bleft); len = strnlen(bcc_ptr, bleft);
if (len >= bleft) if (len >= bleft)
return rc; return;
kfree(ses->serverNOS); kfree(ses->serverNOS);
@ -352,7 +351,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft,
len = strnlen(bcc_ptr, bleft); len = strnlen(bcc_ptr, bleft);
if (len > bleft) if (len > bleft)
return rc; return;
/* No domain field in LANMAN case. Domain is /* No domain field in LANMAN case. Domain is
returned by old servers in the SMB negprot response */ 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 but thus do return domain here we could add parsing
for it later, but it is not very important */ for it later, but it is not very important */
cifs_dbg(FYI, "ascii: bytes left %d\n", bleft); cifs_dbg(FYI, "ascii: bytes left %d\n", bleft);
return rc;
} }
int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len, int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len,
@ -938,8 +935,7 @@ ssetup_ntlmssp_authenticate:
} }
decode_unicode_ssetup(&bcc_ptr, bytes_remaining, ses, nls_cp); decode_unicode_ssetup(&bcc_ptr, bytes_remaining, ses, nls_cp);
} else { } else {
rc = decode_ascii_ssetup(&bcc_ptr, bytes_remaining, decode_ascii_ssetup(&bcc_ptr, bytes_remaining, ses, nls_cp);
ses, nls_cp);
} }
ssetup_exit: ssetup_exit: