VisionFive2 Linux kernel

author: Aurelien Aptel <aaptel@suse.com> 2021-05-21 17:19:27 +0200 committer: Steve French <stfrench@microsoft.com> 2021-05-27 14:03:47 -0500 commit: 6d2fcfe6b517fe7cbf2687adfb0a16cdcd5d9243 parent: c4681547bcce777daf576925a966ffa824edd09d

Commit Summary:

cifs: set server->cipher_type to AES-128-CCM for SMB3.0

Diffstat:

1 file changed, 7 insertions, 0 deletions

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 9f24eb88297a..c205f93e0a10 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -958,6 +958,13 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
 	/* Internal types */
 	server->capabilities |= SMB2_NT_FIND | SMB2_LARGE_FILES;
 
+	/*
+	 * SMB3.0 supports only 1 cipher and doesn't have a encryption neg context
+	 * Set the cipher type manually.
+	 */
+	if (server->dialect == SMB30_PROT_ID && (server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION))
+		server->cipher_type = SMB2_ENCRYPTION_AES128_CCM;
+
 	security_blob = smb2_get_data_area_len(&blob_offset, &blob_length,
 					       (struct smb2_sync_hdr *)rsp);
 	/*