summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsglob.h
diff options
context:
space:
mode:
authorSteve French <smfrench@gmail.com>2018-04-09 10:47:14 -0500
committerSteve French <smfrench@gmail.com>2018-04-12 16:54:06 -0500
commit5100d8a3fe034845926266a4e7f5bdcbb859088b (patch)
tree350de14c3b16b0657664b18e4c045a96a4f574c6 /fs/cifs/cifsglob.h
parent136ff1b4b65edf09b6b7173ba94ad53347d3aa83 (diff)
downloadblackbird-op-linux-5100d8a3fe034845926266a4e7f5bdcbb859088b.tar.gz
blackbird-op-linux-5100d8a3fe034845926266a4e7f5bdcbb859088b.zip
SMB311: Improve checking of negotiate security contexts
SMB3.11 crypto and hash contexts were not being checked strictly enough. Add parsing and validity checking for the security contexts in the SMB3.11 negotiate response. Signed-off-by: Steve French <smfrench@gmail.com> CC: Stable <stable@vger.kernel.org> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r--fs/cifs/cifsglob.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 2282562e78a1..56fee0330afc 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -676,6 +676,7 @@ struct TCP_Server_Info {
unsigned int max_read;
unsigned int max_write;
#ifdef CONFIG_CIFS_SMB311
+ __le16 cipher_type;
/* save initital negprot hash */
__u8 preauth_sha_hash[SMB2_PREAUTH_HASH_SIZE];
#endif /* 3.1.1 */
OpenPOWER on IntegriCloud