diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-04 14:57:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-04 14:57:55 -0800 |
| commit | 8d9cbf8240023f5b6d19f2106aff3d7077fc4a3b (patch) | |
| tree | f795383da4de9b99efb933f02b26d2bdf2746f0d | |
| parent | f423fc627b05f47bc9305f9661630fce30f208f9 (diff) | |
| parent | 225de11e31c1cecd04839b859a0b8f81d490a50b (diff) | |
| download | linux-8d9cbf8240023f5b6d19f2106aff3d7077fc4a3b.tar.gz linux-8d9cbf8240023f5b6d19f2106aff3d7077fc4a3b.tar.bz2 linux-8d9cbf8240023f5b6d19f2106aff3d7077fc4a3b.zip | |
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6:
[CIFS] default ntlmv2 for cifs mount delayed to 3.3
cifs: fix bad buffer length check in coalesce_t2
| -rw-r--r-- | fs/cifs/connect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 8cd4b52d4217..f3670cf72587 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -282,7 +282,7 @@ static int coalesce_t2(struct smb_hdr *psecond, struct smb_hdr *pTargetSMB) byte_count = be32_to_cpu(pTargetSMB->smb_buf_length); byte_count += total_in_buf2; /* don't allow buffer to overflow */ - if (byte_count > CIFSMaxBufSize) + if (byte_count > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) return -ENOBUFS; pTargetSMB->smb_buf_length = cpu_to_be32(byte_count); @@ -2122,7 +2122,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info) warned_on_ntlm = true; cERROR(1, "default security mechanism requested. The default " "security mechanism will be upgraded from ntlm to " - "ntlmv2 in kernel release 3.2"); + "ntlmv2 in kernel release 3.3"); } ses->overrideSecFlg = volume_info->secFlg; |