aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/cifs/connect.c6
-rw-r--r--fs/cifs/file.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index f6ffb5bd29f..bae1479318d 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2490,7 +2490,7 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,
2490 } /* else no more room so create dummy domain string */ 2490 } /* else no more room so create dummy domain string */
2491 else { 2491 else {
2492 if(ses->serverDomain) 2492 if(ses->serverDomain)
2493 ` kfree(ses->serverDomain); 2493 kfree(ses->serverDomain);
2494 ses->serverDomain = 2494 ses->serverDomain =
2495 kzalloc(2,GFP_KERNEL); 2495 kzalloc(2,GFP_KERNEL);
2496 } 2496 }
@@ -2528,7 +2528,7 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,
2528 2528
2529 len = strnlen(bcc_ptr, 1024); 2529 len = strnlen(bcc_ptr, 1024);
2530 if(ses->serverDomain) 2530 if(ses->serverDomain)
2531 kfree(ses->severDomain); 2531 kfree(ses->serverDomain);
2532 ses->serverDomain = kzalloc(len + 1, GFP_KERNEL); 2532 ses->serverDomain = kzalloc(len + 1, GFP_KERNEL);
2533 strncpy(ses->serverDomain, bcc_ptr, len); 2533 strncpy(ses->serverDomain, bcc_ptr, len);
2534 bcc_ptr += len; 2534 bcc_ptr += len;
@@ -3174,7 +3174,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
3174 the end since (at least) WIN2K and Windows XP have a major bug in not null 3174 the end since (at least) WIN2K and Windows XP have a major bug in not null
3175 terminating last Unicode string in response */ 3175 terminating last Unicode string in response */
3176 if(ses->serverOS) 3176 if(ses->serverOS)
3177 kfree(serverOS); 3177 kfree(ses->serverOS);
3178 ses->serverOS = 3178 ses->serverOS =
3179 kzalloc(2 * (len + 1), GFP_KERNEL); 3179 kzalloc(2 * (len + 1), GFP_KERNEL);
3180 cifs_strfromUCS_le(ses->serverOS, 3180 cifs_strfromUCS_le(ses->serverOS,
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index c881a1a29f0..5e59723c02b 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -905,8 +905,8 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
905 break; 905 break;
906 } 906 }
907 if(experimEnabled || (pTcon->ses->server && 907 if(experimEnabled || (pTcon->ses->server &&
908 (pTcon->ses->server->secMode & 908 ((pTcon->ses->server->secMode &
909 (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED) 909 (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
910 == 0))) { 910 == 0))) {
911 struct kvec iov[2]; 911 struct kvec iov[2];
912 unsigned int len; 912 unsigned int len;