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

Commit 9ee56388 authored by Steve French's avatar Steve French Committed by Greg Kroah-Hartman
Browse files

SMB3.1.1: do not log warning message if server doesn't populate salt 



commit 7955f105afb6034af344038d663bc98809483cdd upstream.

In the negotiate protocol preauth context, the server is not required
to populate the salt (although it is done by most servers) so do
not warn on mount.

We retain the checks (warn) that the preauth context is the minimum
size and that the salt does not exceed DataLength of the SMB response.
Although we use the defaults in the case that the preauth context
response is invalid, these checks may be useful in the future
as servers add support for additional mechanisms.

CC: Stable <stable@vger.kernel.org>
Reviewed-by: default avatarShyam Prasad N <sprasad@microsoft.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75bf69c4

fs/cifs/smb2pdu.c

+5 −2
Original line number Diff line number Diff line
@@ -406,8 +406,8 @@ build_preauth_ctxt(struct smb2_preauth_neg_context *pneg_ctxt) 
	pneg_ctxt->ContextType = SMB2_PREAUTH_INTEGRITY_CAPABILITIES;

	pneg_ctxt->DataLength = cpu_to_le16(38);

	pneg_ctxt->HashAlgorithmCount = cpu_to_le16(1);

	pneg_ctxt->SaltLength = cpu_to_le16(SMB311_SALT_SIZE);

	get_random_bytes(pneg_ctxt->Salt, SMB311_SALT_SIZE);

	pneg_ctxt->SaltLength = cpu_to_le16(SMB311_LINUX_CLIENT_SALT_SIZE);

	get_random_bytes(pneg_ctxt->Salt, SMB311_LINUX_CLIENT_SALT_SIZE);

	pneg_ctxt->HashAlgorithms = SMB2_PREAUTH_INTEGRITY_SHA512;

}
@@ -461,6 +461,9 @@ static void decode_preauth_context(struct smb2_preauth_neg_context *ctxt) 
	if (len < MIN_PREAUTH_CTXT_DATA_LEN) {

		printk_once(KERN_WARNING "server sent bad preauth context\n");

		return;

	} else if (len < MIN_PREAUTH_CTXT_DATA_LEN + le16_to_cpu(ctxt->SaltLength)) {

		pr_warn_once("server sent invalid SaltLength\n");

		return;

	}

	if (le16_to_cpu(ctxt->HashAlgorithmCount) != 1)

		printk_once(KERN_WARNING "illegal SMB3 hash algorithm count\n");

fs/cifs/smb2pdu.h

+11 −3
Original line number Diff line number Diff line
@@ -257,12 +257,20 @@ struct smb2_neg_context { 
	/* Followed by array of data */

} __packed;



#define SMB311_SALT_SIZE			32

#define SMB311_LINUX_CLIENT_SALT_SIZE			32

/* Hash Algorithm Types */

#define SMB2_PREAUTH_INTEGRITY_SHA512	cpu_to_le16(0x0001)

#define SMB2_PREAUTH_HASH_SIZE 64



#define MIN_PREAUTH_CTXT_DATA_LEN	(SMB311_SALT_SIZE + 6)

/*

 * SaltLength that the server send can be zero, so the only three required

 * fields (all __le16) end up six bytes total, so the minimum context data len

 * in the response is six bytes which accounts for

 *

 *      HashAlgorithmCount, SaltLength, and 1 HashAlgorithm.

 */

#define MIN_PREAUTH_CTXT_DATA_LEN 6



struct smb2_preauth_neg_context {

	__le16	ContextType; /* 1 */

	__le16	DataLength;
@@ -270,7 +278,7 @@ struct smb2_preauth_neg_context { 
	__le16	HashAlgorithmCount; /* 1 */

	__le16	SaltLength;

	__le16	HashAlgorithms; /* HashAlgorithms[0] since only one defined */

	__u8	Salt[SMB311_SALT_SIZE];

	__u8	Salt[SMB311_LINUX_CLIENT_SALT_SIZE];

} __packed;



/* Encryption Algorithms Ciphers */