Commit 5ed11af1 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1 



SMB2_GLOBAL_CAP_ENCRYPTION flag should be used only for 3.0 and
3.0.2 dialects. This flags set cause compatibility problems with
other SMB clients.

Reported-by: default avatarJames Christopher Adduono <jc@adduono.com>
Tested-by: default avatarJames Christopher Adduono <jc@adduono.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent a677ebd8

fs/smb/server/smb2ops.c

+5 −5
Original line number Diff line number Diff line
@@ -228,6 +228,11 @@ void init_smb3_0_server(struct ksmbd_conn *conn) 
	    conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION)

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION ||

	    (!(server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION_OFF) &&

	     conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION))

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL)

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;

}
@@ -278,11 +283,6 @@ int init_smb3_11_server(struct ksmbd_conn *conn) 
		conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING |

			SMB2_GLOBAL_CAP_DIRECTORY_LEASING;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION ||

	    (!(server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION_OFF) &&

	     conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION))

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL)

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;