mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
commit 5ed11af19e
upstream.
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: James Christopher Adduono <jc@adduono.com>
Tested-by: James Christopher Adduono <jc@adduono.com>
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a637fabac5
commit
67c477f320
1 changed files with 5 additions and 5 deletions
|
@ -228,6 +228,11 @@ void init_smb3_0_server(struct ksmbd_conn *conn)
|
||||||
conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION)
|
conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION)
|
||||||
conn->vals->capabilities |= 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)
|
if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL)
|
||||||
conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;
|
conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;
|
||||||
}
|
}
|
||||||
|
@ -275,11 +280,6 @@ int init_smb3_11_server(struct ksmbd_conn *conn)
|
||||||
conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING |
|
conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING |
|
||||||
SMB2_GLOBAL_CAP_DIRECTORY_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)
|
if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL)
|
||||||
conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;
|
conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue