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

Commit cd49b492 authored by Steve French's avatar Steve French
Browse files

[CIFS] remove some redundant null pointer checks 



some of them pointed out by Dave Jones

Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent f90f00a3

fs/cifs/connect.c

+15 −30
Original line number Diff line number Diff line
@@ -2173,7 +2173,6 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
				if (remaining_words > 0) {

					len = UniStrnlen((wchar_t *)bcc_ptr,

							 remaining_words-1);

					if(ses->serverNOS)

					kfree(ses->serverNOS);

					ses->serverNOS = kzalloc(2 * (len + 1),GFP_KERNEL);

					if(ses->serverNOS == NULL)
@@ -2214,11 +2213,9 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
					/* if these kcallocs fail not much we

					   can do, but better to not fail the

					   sesssetup itself */

					if(ses->serverDomain)

					kfree(ses->serverDomain);

					ses->serverDomain =

					    kzalloc(2, GFP_KERNEL);

					if(ses->serverNOS)

					kfree(ses->serverNOS);

					ses->serverNOS =

					    kzalloc(2, GFP_KERNEL);
@@ -2228,7 +2225,6 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
				if (((long) bcc_ptr + len) - (long)

				    pByteArea(smb_buffer_response)

					    <= BCC(smb_buffer_response)) {

					if(ses->serverOS)

					kfree(ses->serverOS);

					ses->serverOS = kzalloc(len + 1,GFP_KERNEL);

					if(ses->serverOS == NULL)
@@ -2240,7 +2236,6 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
					bcc_ptr++;



					len = strnlen(bcc_ptr, 1024);

					if(ses->serverNOS)

					kfree(ses->serverNOS);

					ses->serverNOS = kzalloc(len + 1,GFP_KERNEL);

					if(ses->serverNOS == NULL)
@@ -2508,7 +2503,6 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, 
								 bcc_ptr,

								 remaining_words

								 - 1);

						if(ses->serverNOS)

						kfree(ses->serverNOS);

						ses->serverNOS =

						    kzalloc(2 * (len + 1),
@@ -2527,7 +2521,6 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, 
						if (remaining_words > 0) {

							len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words);	

           /* last string is not always null terminated (for e.g. for Windows XP & 2000) */

							if(ses->serverDomain)

							kfree(ses->serverDomain);

							ses->serverDomain =

							    kzalloc(2 *
@@ -2547,18 +2540,15 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, 
							    = 0;

						} /* else no more room so create dummy domain string */

						else {

							if(ses->serverDomain)

							kfree(ses->serverDomain);

							ses->serverDomain =

							    kzalloc(2,

								    GFP_KERNEL);

						}

					} else {	/* no room so create dummy domain and NOS string */

						if(ses->serverDomain);

						kfree(ses->serverDomain);

						ses->serverDomain =

						    kzalloc(2, GFP_KERNEL);

						if(ses->serverNOS)

						kfree(ses->serverNOS);

						ses->serverNOS =

						    kzalloc(2, GFP_KERNEL);
@@ -2581,7 +2571,6 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, 
						bcc_ptr++;



						len = strnlen(bcc_ptr, 1024);

						if(ses->serverNOS)

						kfree(ses->serverNOS);

						ses->serverNOS =

						    kzalloc(len + 1,
@@ -2592,7 +2581,6 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, 
						bcc_ptr++;



						len = strnlen(bcc_ptr, 1024);

						if(ses->serverDomain)

						kfree(ses->serverDomain);

						ses->serverDomain =

						    kzalloc(len + 1,
@@ -2915,7 +2903,6 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
								 bcc_ptr,

								 remaining_words

								 - 1);

						if(ses->serverNOS)

						kfree(ses->serverNOS);

						ses->serverNOS =

						    kzalloc(2 * (len + 1),
@@ -2969,7 +2956,6 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
						if(ses->serverDomain)

							kfree(ses->serverDomain);

						ses->serverDomain = kzalloc(2, GFP_KERNEL);

						if(ses->serverNOS)

						kfree(ses->serverNOS);

						ses->serverNOS = kzalloc(2, GFP_KERNEL);

					}
@@ -2988,7 +2974,6 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
						bcc_ptr++;



						len = strnlen(bcc_ptr, 1024);

						if(ses->serverNOS)

						kfree(ses->serverNOS);

						ses->serverNOS = kzalloc(len+1,GFP_KERNEL);

						strncpy(ses->serverNOS, bcc_ptr, len);