Commit 74496d36 authored by Wei Yongjun's avatar Wei Yongjun Committed by Steve French
Browse files

cifs: remove some pointless conditionals before kfree() 



Remove some pointless conditionals before kfree().

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 0f4d634c

fs/cifs/connect.c

+12 −24
Original line number Diff line number Diff line
@@ -2673,7 +2673,6 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
/* We look for obvious messed up bcc or strings in response so we do not go off

   the end since (at least) WIN2K and Windows XP have a major bug in not null

   terminating last Unicode string in response  */

				if (ses->serverOS)

				kfree(ses->serverOS);

				ses->serverOS = kzalloc(2 * (len + 1),

							GFP_KERNEL);
@@ -2710,7 +2709,6 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
						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*(len+1),
@@ -2725,7 +2723,6 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
						ses->serverDomain[1+(2*len)] = 0;

					} else { /* else no more room so create

						  dummy domain string */

						if (ses->serverDomain)

						kfree(ses->serverDomain);

						ses->serverDomain =

							kzalloc(2, GFP_KERNEL);
@@ -2772,7 +2769,6 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
					bcc_ptr++;



					len = strnlen(bcc_ptr, 1024);

					if (ses->serverDomain)

					kfree(ses->serverDomain);

					ses->serverDomain = kzalloc(len + 1,

								    GFP_KERNEL);
@@ -3013,7 +3009,6 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, 
/* We look for obvious messed up bcc or strings in response so we do not go off

   the end since (at least) WIN2K and Windows XP have a major bug in not null

   terminating last Unicode string in response  */

					if (ses->serverOS)

					kfree(ses->serverOS);

					ses->serverOS =

					    kzalloc(2 * (len + 1), GFP_KERNEL);
@@ -3086,7 +3081,6 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, 
					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,
@@ -3414,7 +3408,6 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
/* We look for obvious messed up bcc or strings in response so we do not go off

  the end since (at least) WIN2K and Windows XP have a major bug in not null

  terminating last Unicode string in response  */

					if (ses->serverOS)

					kfree(ses->serverOS);

					ses->serverOS =

					    kzalloc(2 * (len + 1), GFP_KERNEL);
@@ -3448,7 +3441,6 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
						if (remaining_words > 0) {

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

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

							if (ses->serverDomain)

							kfree(ses->serverDomain);

							ses->serverDomain =

							    kzalloc(2 *
@@ -3476,12 +3468,10 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
							    = 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);

						kfree(ses->serverNOS);
@@ -3492,7 +3482,6 @@ CIFSNTLMSSPAuthSessSetup(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);

						strncpy(ses->serverOS,bcc_ptr, len);
@@ -3512,7 +3501,6 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
						bcc_ptr++;



						len = strnlen(bcc_ptr, 1024);

						if (ses->serverDomain)

						kfree(ses->serverDomain);

						ses->serverDomain =

								kzalloc(len+1,