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

Commit 8d9cbf82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f423fc62 225de11e

fs/cifs/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -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;