tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 8d9cbf82 f423fc62

+2 -2
+2 -2
fs/cifs/connect.c
··· 282 282 byte_count = be32_to_cpu(pTargetSMB->smb_buf_length); 283 283 byte_count += total_in_buf2; 284 284 /* don't allow buffer to overflow */ 285 - if (byte_count > CIFSMaxBufSize) 285 + if (byte_count > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) 286 286 return -ENOBUFS; 287 287 pTargetSMB->smb_buf_length = cpu_to_be32(byte_count); 288 288 ··· 2122 2122 warned_on_ntlm = true; 2123 2123 cERROR(1, "default security mechanism requested. The default " 2124 2124 "security mechanism will be upgraded from ntlm to " 2125 - "ntlmv2 in kernel release 3.2"); 2125 + "ntlmv2 in kernel release 3.3"); 2126 2126 } 2127 2127 ses->overrideSecFlg = volume_info->secFlg; 2128 2128