diff options
| author | Steve French <smfrench@gmail.com> | 2015-09-22 10:16:27 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2015-09-24 07:53:31 +0200 |
| commit | 88627148400e37b4bff197285d348fc05c9de013 (patch) | |
| tree | 1643389ce75ff2f6e58818c53aafc148708b0ce7 | |
| parent | [SMB3] Fix sec=krb5 on smb3 mounts (diff) | |
| download | linux-88627148400e37b4bff197285d348fc05c9de013.tar.xz linux-88627148400e37b4bff197285d348fc05c9de013.zip | |
fix encryption error checks on mount
Signed-off-by: Steve French <steve.french@primarydata.com>
| -rw-r--r-- | fs/cifs/smb2pdu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index e543431db916..ce83e2edbe0a 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -922,6 +922,12 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, if (tcon && tcon->bad_network_name) return -ENOENT; + if ((tcon->seal) && + ((ses->server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION) == 0)) { + cifs_dbg(VFS, "encryption requested but no server support"); + return -EOPNOTSUPP; + } + unc_path = kmalloc(MAX_SHARENAME_LENGTH * 2, GFP_KERNEL); if (unc_path == NULL) return -ENOMEM; @@ -1001,6 +1007,8 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, ((tcon->share_flags & SHI1005_FLAGS_DFS) == 0)) cifs_dbg(VFS, "DFS capability contradicts DFS flag\n"); init_copy_chunk_defaults(tcon); + if (tcon->share_flags & SHI1005_FLAGS_ENCRYPT_DATA) + cifs_dbg(VFS, "Encrypted shares not supported"); if (tcon->ses->server->ops->validate_negotiate) rc = tcon->ses->server->ops->validate_negotiate(xid, tcon); tcon_exit: |