Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 05:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

cifs: throw a warning if negotiate or sess_setup ops are passed NULL server or session pointers

Browse Source 
These look pretty cargo-culty to me, but let's be certain. Leave
them in place for now. Pop a WARN if it ever does happen. Also,
move to a more standard idiom for setting the "server" pointer.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-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:01 -04:00 committed by Steve French
parent 7d06645969
commit 3534b8508e
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/cifs/cifssmb.c
View File

@ -375,16 +375,15 @@ CIFSSMBNegotiate(const unsigned int xid, struct cifs_ses *ses)
int rc = 0;
int bytes_returned;
int i;
struct TCP_Server_Info *server;
struct TCP_Server_Info *server = ses->server;
u16 count;
unsigned int secFlags;
if (ses->server)
server = ses->server;
else {
rc = -EIO;
return rc;
if (!server) {
WARN(1, "%s: server is NULL!\n", __func__);
return -EIO;
}
rc = smb_init(SMB_COM_NEGOTIATE, 0, NULL /* no tcon yet */ ,
(void **) &pSMB, (void **) &pSMBr);
if (rc)

4
fs/cifs/sess.c
View File

@ -576,8 +576,10 @@ CIFS_SessSetup(const unsigned int xid, struct cifs_ses *ses,
u16 blob_len;
char *ntlmsspblob = NULL;
if (ses == NULL)
if (ses == NULL) {
WARN(1, "%s: ses == NULL!", __func__);
return -EINVAL;
}
type = ses->server->secType;
cifs_dbg(FYI, "sess setup type %d\n", type);

20
fs/cifs/smb2pdu.c
View File

@ -328,7 +328,7 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
struct kvec iov[1];
int rc = 0;
int resp_buftype;
struct TCP_Server_Info *server;
struct TCP_Server_Info *server = ses->server;
unsigned int sec_flags;
u16 temp = 0;
int blob_offset, blob_length;
@ -337,11 +337,9 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
cifs_dbg(FYI, "Negotiate protocol\n");
if (ses->server)
server = ses->server;
else {
rc = -EIO;
return rc;
if (!server) {
WARN(1, "%s: server is NULL!\n", __func__);
return -EIO;
}
rc = small_smb2_init(SMB2_NEGOTIATE, NULL, (void **) &req);
@ -480,7 +478,7 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses,
int rc = 0;
int resp_buftype;
__le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */
struct TCP_Server_Info *server;
struct TCP_Server_Info *server = ses->server;
unsigned int sec_flags;
u8 temp = 0;
u16 blob_length = 0;
@ -490,11 +488,9 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses,
cifs_dbg(FYI, "Session Setup\n");
if (ses->server)
server = ses->server;
else {
rc = -EIO;
return rc;
if (!server) {
WARN(1, "%s: server is NULL!\n", __func__);
return -EIO;
}
/*