cifs: Remove locking in smb2_verify_signature() when calculating SMB2/SMB3 signature on receiving packets
Subsystems (2)
PATCH 1/1 cifs: Remove locking in smb2_verify_signature() when calculating SMB2/SMB3 signature on receiving packets
From: Long Li <[email protected]>
On the sending and receiving paths, CIFS uses the same cypto data structures to calculate SMB2/SMB3 packet signatures. A lock on the receiving path is necessary to control shared access to crypto data structures. This lock degrades performance because it races with the sending path.
Define separate crypto data structures for sending and receiving paths and remove this lock.
--- fs/cifs/cifsencrypt.c | 29 +++++---- fs/cifs/cifsglob.h | 21 +++++-- fs/cifs/smb2proto.h | 4 +- fs/cifs/smb2transport.c | 130 +++++++++++++++++++++++++--------------- 4 files changed, 119 insertions(+), 65 deletions(-)
fs/cifs/cifsencrypt.c +18 -11
@@ -804,16 +804,27 @@ calc_seckey(struct cifs_ses *ses)void cifs_crypto_secmech_release (struct TCP_Server_Info *server) { -if (server->secmech.cmacaes) { -crypto_free_shash (server->secmech.cmacaes); - server->secmech.cmacaes =NULL ; - } +int i; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +if (server->secmech.cmacaes[i]) { +crypto_free_shash (server->secmech.cmacaes[i]); + server->secmech.cmacaes[i] =NULL ; + } -if (server->secmech.hmacsha256) { -crypto_free_shash (server->secmech.hmacsha256); - server->secmech.hmacsha256 =NULL ; +if (server->secmech.hmacsha256[i]) { +crypto_free_shash (server->secmech.hmacsha256[i]); + server->secmech.hmacsha256[i] =NULL ; + } + +kfree (server->secmech.sdesccmacaes[i]); + server->secmech.sdesccmacaes[i] =NULL ; + +kfree (server->secmech.sdeschmacsha256[i]); + server->secmech.sdeschmacsha256[i] =NULL ; } +if (server->secmech.md5) {crypto_free_shash (server->secmech.md5); server->secmech.md5 =NULL ;
@@ -839,10 +850,6 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server) server->secmech.ccmaesdecrypt =NULL ; } -kfree (server->secmech.sdesccmacaes); - server->secmech.sdesccmacaes =NULL ; -kfree (server->secmech.sdeschmacsha256); - server->secmech.sdeschmacsha256 =NULL ;kfree (server->secmech.sdeschmacmd5); server->secmech.sdeschmacmd5 =NULL ;kfree (server->secmech.sdescmd5);
fs/cifs/cifsglob.h +16 -5
@@ -137,17 +137,27 @@ struct sdesc {char ctx[]; }; +enum { +CIFS_SECMECH_DIR_IN =0 , +CIFS_SECMECH_DIR_OUT , +CIFS_SECMECH_DIR_MAX +}; +/* crypto hashing related structure/fields, not specific to a sec mech */ struct cifs_secmech {struct crypto_shash *hmacmd5;/* hmac-md5 hash function */ struct crypto_shash *md5;/* md5 hash function */ -struct crypto_shash *hmacsha256;/* hmac-sha256 hash function */ -struct crypto_shash *cmacaes;/* block-cipher based MAC function */ +/* hmac-sha256 hash functions */ +struct crypto_shash *hmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* block-cipher based MAC function */ +struct crypto_shash *cmacaes[CIFS_SECMECH_DIR_MAX ];struct crypto_shash *sha512;/* sha512 hash function */ struct sdesc *sdeschmacmd5;/* ctxt to generate ntlmv2 hash, CR1 */ struct sdesc *sdescmd5;/* ctxt to generate cifs/smb signature */ -struct sdesc *sdeschmacsha256;/* ctxt to generate smb2 signature */ -struct sdesc *sdesccmacaes;/* ctxt to generate smb3 signature */ +/* ctxt to generate smb2 signature */ +struct sdesc *sdeschmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* ctxt to generate smb3 signature */ +struct sdesc *sdesccmacaes[CIFS_SECMECH_DIR_MAX ];struct sdesc *sdescsha512;/* ctxt to generate smb3.11 signing key */ struct crypto_aead *ccmaesencrypt;/* smb3 encryption aead */ struct crypto_aead *ccmaesdecrypt;/* smb3 decryption aead */
@@ -426,7 +436,8 @@ struct smb_version_operations {/* generate new lease key */ void (*new_lease_key)(struct cifs_fid *);int (*generate_signingkey)(struct cifs_ses *); -int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *); +int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *, +int direction);int (*set_integrity)(const unsigned int ,struct cifs_tcon *tcon,struct cifsFileInfo *src_file); int (*enum_snapshots)(const unsigned int xid, struct cifs_tcon *tcon,
fs/cifs/smb2proto.h +2 -2
@@ -55,9 +55,9 @@ extern struct cifs_ses *smb2_find_smb_ses(struct TCP_Server_Info *server,extern struct cifs_tcon *smb2_find_smb_tcon (struct TCP_Server_Info *server,__u64 ses_id,__u32 tid);extern int smb2_calc_signature (struct smb_rqst *rqst, -struct TCP_Server_Info *server); +struct TCP_Server_Info *server,int direction);extern int smb3_calc_signature (struct smb_rqst *rqst, -struct TCP_Server_Info *server); +struct TCP_Server_Info *server,int direction);extern void smb2_echo_request (struct work_struct *work);extern __le32 smb2_get_lease_state (struct cifsInodeInfo *cinode); extern bool smb2_is_valid_oplock_break(char *buffer,
fs/cifs/smb2transport.c +83 -47
269 lines not on this page · raw message
Signature · 1 line
2.17.1
ср, 25 мар. 2020 г. в 11:15, <[email protected]>:
Quoted 405 lines
From: Long Li <[email protected]>
On the sending and receiving paths, CIFS uses the same cypto data structures to calculate SMB2/SMB3 packet signatures. A lock on the receiving path is necessary to control shared access to crypto data structures. This lock degrades performance because it races with the sending path.
Define separate crypto data structures for sending and receiving paths and remove this lock.
Signed-off-by Long Li <[email protected]>--- fs/cifs/cifsencrypt.c | 29 +++++---- fs/cifs/cifsglob.h | 21 +++++-- fs/cifs/smb2proto.h | 4 +- fs/cifs/smb2transport.c | 130 +++++++++++++++++++++++++--------------- 4 files changed, 119 insertions(+), 65 deletions(-)fs/cifs/cifsencrypt.c +18
-11@@ -804,16 +804,27 @@ calc_seckey(struct cifs_ses *ses)void cifs_crypto_secmech_release (struct TCP_Server_Info *server) { -if (server->secmech.cmacaes) { -crypto_free_shash (server->secmech.cmacaes); - server->secmech.cmacaes =NULL ; - } +int i; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +if (server->secmech.cmacaes[i]) { +crypto_free_shash (server->secmech.cmacaes[i]); + server->secmech.cmacaes[i] =NULL ; + } -if (server->secmech.hmacsha256) { -crypto_free_shash (server->secmech.hmacsha256); - server->secmech.hmacsha256 =NULL ; +if (server->secmech.hmacsha256[i]) { +crypto_free_shash (server->secmech.hmacsha256[i]); + server->secmech.hmacsha256[i] =NULL ; + } + +kfree (server->secmech.sdesccmacaes[i]); + server->secmech.sdesccmacaes[i] =NULL ; + +kfree (server->secmech.sdeschmacsha256[i]); + server->secmech.sdeschmacsha256[i] =NULL ; } +if (server->secmech.md5) {crypto_free_shash (server->secmech.md5); server->secmech.md5 =NULL ;@@ -839,10 +850,6 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server) server->secmech.ccmaesdecrypt =NULL ; } -kfree (server->secmech.sdesccmacaes); - server->secmech.sdesccmacaes =NULL ; -kfree (server->secmech.sdeschmacsha256); - server->secmech.sdeschmacsha256 =NULL ;kfree (server->secmech.sdeschmacmd5); server->secmech.sdeschmacmd5 =NULL ;kfree (server->secmech.sdescmd5);fs/cifs/cifsglob.h +16
-5@@ -137,17 +137,27 @@ struct sdesc {char ctx[]; }; +enum { +CIFS_SECMECH_DIR_IN =0 , +CIFS_SECMECH_DIR_OUT , +CIFS_SECMECH_DIR_MAX +}; +/* crypto hashing related structure/fields, not specific to a sec mech */ struct cifs_secmech {struct crypto_shash *hmacmd5;/* hmac-md5 hash function */ struct crypto_shash *md5;/* md5 hash function */ -struct crypto_shash *hmacsha256;/* hmac-sha256 hash function */ -struct crypto_shash *cmacaes;/* block-cipher based MAC function */ +/* hmac-sha256 hash functions */ +struct crypto_shash *hmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* block-cipher based MAC function */ +struct crypto_shash *cmacaes[CIFS_SECMECH_DIR_MAX ];struct crypto_shash *sha512;/* sha512 hash function */ struct sdesc *sdeschmacmd5;/* ctxt to generate ntlmv2 hash, CR1 */ struct sdesc *sdescmd5;/* ctxt to generate cifs/smb signature */ -struct sdesc *sdeschmacsha256;/* ctxt to generate smb2 signature */ -struct sdesc *sdesccmacaes;/* ctxt to generate smb3 signature */ +/* ctxt to generate smb2 signature */ +struct sdesc *sdeschmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* ctxt to generate smb3 signature */ +struct sdesc *sdesccmacaes[CIFS_SECMECH_DIR_MAX ];struct sdesc *sdescsha512;/* ctxt to generate smb3.11 signing key */ struct crypto_aead *ccmaesencrypt;/* smb3 encryption aead */ struct crypto_aead *ccmaesdecrypt;/* smb3 decryption aead */ @@ -426,7 +436,8 @@ struct smb_version_operations {/* generate new lease key */ void (*new_lease_key)(struct cifs_fid *);int (*generate_signingkey)(struct cifs_ses *); -int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *); +int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *, +int direction);int (*set_integrity)(const unsigned int ,struct cifs_tcon *tcon,struct cifsFileInfo *src_file); int (*enum_snapshots)(const unsigned int xid, struct cifs_tcon *tcon,fs/cifs/smb2proto.h +2
-2@@ -55,9 +55,9 @@ extern struct cifs_ses *smb2_find_smb_ses(struct TCP_Server_Info *server,extern struct cifs_tcon *smb2_find_smb_tcon (struct TCP_Server_Info *server,__u64 ses_id,__u32 tid);extern int smb2_calc_signature (struct smb_rqst *rqst, -struct TCP_Server_Info *server); +struct TCP_Server_Info *server,int direction);extern int smb3_calc_signature (struct smb_rqst *rqst, -struct TCP_Server_Info *server); +struct TCP_Server_Info *server,int direction);extern void smb2_echo_request (struct work_struct *work);extern __le32 smb2_get_lease_state (struct cifsInodeInfo *cinode); extern bool smb2_is_valid_oplock_break(char *buffer,fs/cifs/smb2transport.c +82
-44@@ -43,30 +43,51 @@static int smb2_crypto_shash_allocate (struct TCP_Server_Info *server) { -return cifs_alloc_hash ("hmac(sha256)" , - &server->secmech.hmacsha256, - &server->secmech.sdeschmacsha256); +int i, rc; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &server->secmech.hmacsha256[i], + &server->secmech.sdeschmacsha256[i]); +if (rc) + goto fail; + } +return 0 ; + +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) +cifs_free_hash ( + &server->secmech.hmacsha256[i], + &server->secmech.sdeschmacsha256[i]); +return rc; }static int smb3_crypto_shash_allocate (struct TCP_Server_Info *server) {struct cifs_secmech *p = &server->secmech; -int rc; +int i, rc; - rc =cifs_alloc_hash ("hmac(sha256)" , - &p->hmacsha256, - &p->sdeschmacsha256); -if (rc) - goto err; +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &p->hmacsha256[i], + &p->sdeschmacsha256[i]); +if (rc) + goto fail; - rc =cifs_alloc_hash ("cmac(aes)" , &p->cmacaes, &p->sdesccmacaes); -if (rc) - goto err; + rc =cifs_alloc_hash ("cmac(aes)" , + &p->cmacaes[i], &p->sdesccmacaes[i]); +if (rc) + goto fail; + }return 0 ; -err: -cifs_free_hash (&p->hmacsha256, &p->sdeschmacsha256); + +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +cifs_free_hash (&p->hmacsha256[i], &p->sdeschmacsha256[i]); +cifs_free_hash (&p->cmacaes[i], &p->sdesccmacaes[i]); + }return rc; }@@ -74,27 +95,32 @@ int smb311_crypto_shash_allocate(struct TCP_Server_Info *server) {struct cifs_secmech *p = &server->secmech; -int rc =0 ; +int i, rc =0 ; - rc =cifs_alloc_hash ("hmac(sha256)" , - &p->hmacsha256, - &p->sdeschmacsha256); -if (rc) -return rc; +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &p->hmacsha256[i], + &p->sdeschmacsha256[i]); +if (rc) + goto fail; - rc =cifs_alloc_hash ("cmac(aes)" , &p->cmacaes, &p->sdesccmacaes); -if (rc) - goto err; + rc =cifs_alloc_hash ("cmac(aes)" , + &p->cmacaes[i], &p->sdesccmacaes[i]); +if (rc) + goto fail; + } rc =cifs_alloc_hash ("sha512" , &p->sha512, &p->sdescsha512);if (rc) - goto err; + goto fail;return 0 ; -err: -cifs_free_hash (&p->cmacaes, &p->sdesccmacaes); -cifs_free_hash (&p->hmacsha256, &p->sdeschmacsha256); +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +cifs_free_hash (&p->hmacsha256[i], &p->sdeschmacsha256[i]); +cifs_free_hash (&p->cmacaes[i], &p->sdesccmacaes[i]); + }return rc; }@@ -219,7 +245,8 @@ smb2_find_smb_tcon(struct TCP_Server_Info *server, __u64 ses_id, __u32 tid) }int -smb2_calc_signature (struct smb_rqst *rqst,struct TCP_Server_Info *server) +smb2_calc_signature (struct smb_rqst *rqst,struct TCP_Server_Info *server, +int direction) {int rc;unsigned char smb2_signature[SMB2_HMACSHA256_SIZE ];@@ -229,6 +256,7 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)struct cifs_ses *ses;struct shash_desc *shash;struct smb_rqst drqst; +struct crypto_shash *hmacsha256; ses =smb2_find_smb_ses (server, shdr->SessionId);if (!ses) {@@ -245,14 +273,16 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)return rc; } - rc =crypto_shash_setkey (server->secmech.hmacsha256, + hmacsha256 = server->secmech.hmacsha256[direction]; + + rc =crypto_shash_setkey (hmacsha256, ses->auth_key.response,SMB2_NTLMV2_SESSKEY_SIZE );if (rc) {cifs_server_dbg (VFS ,"%s: Could not update with response\n" , __func__);return rc; } - shash = &server->secmech.sdeschmacsha256->shash; + shash = &server->secmech.sdeschmacsha256[direction]->shash; rc =crypto_shash_init (shash);if (rc) {cifs_server_dbg (VFS ,"%s: Could not init sha256" , __func__);@@ -296,6 +326,8 @@ static int generate_key(struct cifs_ses *ses, struct kvec label,unsigned char prfhash[SMB2_HMACSHA256_SIZE ];unsigned char *hashptr = prfhash;struct TCP_Server_Info *server = ses->server; +struct crypto_shash *hmacsha256; +struct sdesc *sdeschmacsha256;memset (prfhash,0x0 ,SMB2_HMACSHA256_SIZE );memset (key,0x0 , key_size);@@ -306,55 +338,58 @@ static int generate_key(struct cifs_ses *ses, struct kvec label, goto smb3signkey_ret; } - rc =crypto_shash_setkey (server->secmech.hmacsha256, + hmacsha256 = server->secmech.hmacsha256[CIFS_SECMECH_DIR_OUT ]; + sdeschmacsha256 = server->secmech.sdeschmacsha256[CIFS_SECMECH_DIR_OUT ]; + + rc =crypto_shash_setkey (hmacsha256, ses->auth_key.response,SMB2_NTLMV2_SESSKEY_SIZE );if (rc) {cifs_server_dbg (VFS ,"%s: Could not set with session key\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_init (&server->secmech.sdeschmacsha256->shash); + rc =crypto_shash_init (&sdeschmacsha256->shash);if (rc) {cifs_server_dbg (VFS ,"%s: Could not init sign hmac\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256->shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, i,4 );if (rc) {cifs_server_dbg (VFS ,"%s: Could not update with n\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256->shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, label.iov_base, label.iov_len);if (rc) {cifs_server_dbg (VFS ,"%s: Could not update with label\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256->shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, &zero,1 );if (rc) {cifs_server_dbg (VFS ,"%s: Could not update with zero\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256->shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, context.iov_base, context.iov_len);if (rc) {cifs_server_dbg (VFS ,"%s: Could not update with context\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256->shash, + rc =crypto_shash_update (&sdeschmacsha256->shash,L ,4 );if (rc) {cifs_server_dbg (VFS ,"%s: Could not update with L\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_final (&server->secmech.sdeschmacsha256->shash, + rc =crypto_shash_final (&sdeschmacsha256->shash, hashptr);if (rc) {cifs_server_dbg (VFS ,"%s: Could not generate sha256 hash\n" , __func__);@@ -504,16 +539,18 @@ generate_smb311signingkey(struct cifs_ses *ses) }int -smb3_calc_signature (struct smb_rqst *rqst,struct TCP_Server_Info *server) +smb3_calc_signature (struct smb_rqst *rqst,struct TCP_Server_Info *server, +int direction) {int rc;unsigned char smb3_signature[SMB2_CMACAES_SIZE ];unsigned char *sigptr = smb3_signature;struct kvec *iov = rqst->rq_iov;struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0 ].iov_base; -struct shash_desc *shash = &server->secmech.sdesccmacaes->shash; +struct shash_desc *shash;struct smb_rqst drqst;u8 key[SMB3_SIGN_KEY_SIZE ]; +struct crypto_shash *cmacaes; rc =smb2_get_sign_key (shdr->SessionId, server, key);if (rc)@@ -522,8 +559,10 @@ smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)memset (smb3_signature,0x0 ,SMB2_CMACAES_SIZE );memset (shdr->Signature,0x0 ,SMB2_SIGNATURE_SIZE ); - rc =crypto_shash_setkey (server->secmech.cmacaes, - key,SMB2_CMACAES_SIZE ); + cmacaes = server->secmech.cmacaes[direction]; + shash = &server->secmech.sdesccmacaes[direction]->shash; + + rc =crypto_shash_setkey (cmacaes, key,SMB2_CMACAES_SIZE );if (rc) {cifs_server_dbg (VFS ,"%s: Could not set key for cmac aes\n" , __func__);return rc;@@ -593,8 +632,7 @@ smb2_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server)return 0 ; } - rc = server->ops->calc_signature (rqst, server); - + rc = server->ops->calc_signature (rqst, server,CIFS_SECMECH_DIR_OUT );return rc; }
fs/cifs/smb2transport.c smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) · line 672
Quoted 7 lines
fs/cifs/smb2transport.c +1
-3@@ -631,9 +669,7 @@ smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)memset (shdr->Signature,0 ,SMB2_SIGNATURE_SIZE ); -mutex_lock (&server->srv_mutex); - rc = server->ops->calc_signature (rqst, server); -mutex_unlock (&server->srv_mutex); + rc = server->ops->calc_signature (rqst, server,CIFS_SECMECH_DIR_IN );
Multiple threads may be calling smb2_verify_signature from smb2_check_receive in separate threads (see compound_send_recv). What will prevent races on crypto data structures once the mutex around calc_signature is removed?
--
Best regards,
Pavel Shilovsky
Quoted 445 lines
Subject: Re: [PATCH] cifs: Remove locking in
smb2_verify_signature()when calculating SMB2/SMB3 signature on receiving packetsср, 25 мар. 2020 г. в 11:15, <[email protected]>:
Quoted 7 lines
From: Long Li <[email protected]>
On the sending and receiving paths, CIFS uses the same cypto data structures to calculate SMB2/SMB3 packet signatures. A lock on the receiving path is necessary to control shared access to crypto data structures. This lock degrades performance because it races with the
sending path.
Quoted 112 lines
Define separate crypto data structures for sending and receiving paths and remove this lock.
Signed-off-by Long Li <[email protected]>--- fs/cifs/cifsencrypt.c | 29 +++++---- fs/cifs/cifsglob.h | 21 +++++-- fs/cifs/smb2proto.h | 4 +- fs/cifs/smb2transport.c | 130 +++++++++++++++++++++++++--------------- 4 files changed, 119 insertions(+), 65 deletions(-)fs/cifs/cifsencrypt.c index renamed from fs/cifs/cifsencrypt.c +0
-0
97b7497c13ef..222e8d13302c100644fs/cifs/cifsencrypt.c +18
-7@@ -804,16 +804,27 @@ calc_seckey(struct cifs_ses *ses) void cifs_crypto_secmech_release(struct TCP_Server_Info *server) { -if (server->secmech.cmacaes) { -crypto_free_shash (server->secmech.cmacaes); - server->secmech.cmacaes =NULL ; - } +int i; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +if (server->secmech.cmacaes[i]) { +crypto_free_shash (server->secmech.cmacaes[i]); + server->secmech.cmacaes[i] =NULL ; + } -if (server->secmech.hmacsha256) { -crypto_free_shash (server->secmech.hmacsha256); - server->secmech.hmacsha256 =NULL ; +if (server->secmech.hmacsha256[i]) { +crypto_free_shash (server->secmech.hmacsha256[i]); + server->secmech.hmacsha256[i] =NULL ; + } + +kfree (server->secmech.sdesccmacaes[i]); + server->secmech.sdesccmacaes[i] =NULL ; + +kfree (server->secmech.sdeschmacsha256[i]); + server->secmech.sdeschmacsha256[i] =NULL ; } +if (server->secmech.md5) {crypto_free_shash (server->secmech.md5); server->secmech.md5 = NULL; @@ -839,10 +850,6 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server) server->secmech.ccmaesdecrypt =NULL ;}fs/cifs/cifsencrypt.c +0
-4-kfree (server->secmech.sdesccmacaes); - server->secmech.sdesccmacaes =NULL ; -kfree (server->secmech.sdeschmacsha256); - server->secmech.sdeschmacsha256 =NULL ;kfree (server->secmech.sdeschmacmd5); server->secmech.sdeschmacmd5 =NULL ; kfree(server->secmech.sdescmd5); diff --git
a/fs/cifs/cifsglob.hb/fs/cifs/cifsglob.hindex0d956360e984..e31a902ebadc100644fs/cifs/cifsglob.h +16
-5@@ -137,17 +137,27 @@ struct sdesc {char ctx[]; }; +enum { +CIFS_SECMECH_DIR_IN =0 , +CIFS_SECMECH_DIR_OUT , +CIFS_SECMECH_DIR_MAX +}; +/* crypto hashing related structure/fields, not specific to a sec mech */ struct cifs_secmech {struct crypto_shash *hmacmd5;/* hmac-md5 hash function */ struct crypto_shash *md5;/* md5 hash function */ -struct crypto_shash *hmacsha256;/* hmac-sha256 hash function */ -struct crypto_shash *cmacaes;/* block-cipher based MAC function */ +/* hmac-sha256 hash functions */ +struct crypto_shash *hmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* block-cipher based MAC function */ +struct crypto_shash *cmacaes[CIFS_SECMECH_DIR_MAX ];struct crypto_shash *sha512;/* sha512 hash function */ struct sdesc *sdeschmacmd5;/* ctxt to generate ntlmv2 hash, CR1 */ struct sdesc *sdescmd5;/* ctxt to generate cifs/smb signature */ -struct sdesc *sdeschmacsha256;/* ctxt to generate smb2 signature */ -struct sdesc *sdesccmacaes;/* ctxt to generate smb3 signature */ +/* ctxt to generate smb2 signature */ +struct sdesc *sdeschmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* ctxt to generate smb3 signature */ +struct sdesc *sdesccmacaes[CIFS_SECMECH_DIR_MAX ];struct sdesc *sdescsha512;/* ctxt to generate smb3.11 signing key */ struct crypto_aead *ccmaesencrypt;/* smb3 encryption aead */ struct crypto_aead *ccmaesdecrypt;/* smb3 decryption aead */ @@ -426,7 +436,8 @@ struct smb_version_operations {/* generate new lease key */ void (*new_lease_key)(struct cifs_fid *);int (*generate_signingkey)(struct cifs_ses *); -int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *); +int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *, +int direction);int (*set_integrity)(const unsigned int ,struct cifs_tcon *tcon,struct cifsFileInfo *src_file); int (*enum_snapshots)(const unsigned int xid, struct cifs_tcon*tcon, diff --git
a/fs/cifs/smb2proto.hb/fs/cifs/smb2proto.hindex4d1ff7b66fdc..f5edd6ea3639100644fs/cifs/smb2proto.h +0
-0@@ -55,9 +55,9 @@ extern struct cifs_ses *smb2_find_smb_ses(structQuoted 1 line
TCP_Server_Info*server, extern structcifs_tcon*smb2_find_smb_tcon(struct
TCP_Server_Info*server,fs/cifs/smb2transport.c smb2_find_smb_tcon(struct TCP_Server_Info
Quoted 127 lines
__u64 ses_id, __u32tid); extern int smb2_calc_signature(struct
smb_rqst*rqst,fs/cifs/smb2proto.h +4
-2- struct TCP_Server_Info *server); +struct TCP_Server_Info *server, int + direction);extern int smb3_calc_signature (struct smb_rqst *rqst, -struct TCP_Server_Info *server); +struct TCP_Server_Info *server,int + direction); extern void smb2_echo_request(struct work_struct *work); extern
__le32smb2_get_lease_state(struct cifsInodeInfo *cinode); extern bool smb2_is_valid_oplock_break(char *buffer, diff --gita/fs/cifs/smb2transport.cb/fs/cifs/smb2transport.cindex08b703b7a15e..c8ba40d8fedf100644fs/cifs/smb2transport.c +53
-27@@ -43,30 +43,51 @@static int smb2_crypto_shash_allocate (struct TCP_Server_Info *server) { -return cifs_alloc_hash ("hmac(sha256)" , - &server->secmech.hmacsha256, - &server->secmech.sdeschmacsha256); +int i, rc; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &server->secmech.hmacsha256[i], + &server->secmech.sdeschmacsha256[i]); +if (rc) + goto fail; + } +return 0 ; + +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) +cifs_free_hash ( + &server->secmech.hmacsha256[i], + &server->secmech.sdeschmacsha256[i]); +return rc; }static int smb3_crypto_shash_allocate (struct TCP_Server_Info *server) {struct cifs_secmech *p = &server->secmech; -int rc; +int i, rc; - rc =cifs_alloc_hash ("hmac(sha256)" , - &p->hmacsha256, - &p->sdeschmacsha256); -if (rc) - goto err; +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &p->hmacsha256[i], + &p->sdeschmacsha256[i]); +if (rc) + goto fail; - rc =cifs_alloc_hash ("cmac(aes)" , &p->cmacaes, &p->sdesccmacaes); -if (rc) - goto err; + rc =cifs_alloc_hash ("cmac(aes)" , + &p->cmacaes[i], &p->sdesccmacaes[i]); +if (rc) + goto fail; + }return 0 ; -err: -cifs_free_hash (&p->hmacsha256, &p->sdeschmacsha256); + +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +cifs_free_hash (&p->hmacsha256[i], &p->sdeschmacsha256[i]); +cifs_free_hash (&p->cmacaes[i], &p->sdesccmacaes[i]); + }return rc; }@@ -74,27 +95,32 @@ int smb311_crypto_shash_allocate(struct TCP_Server_Info *server) {struct cifs_secmech *p = &server->secmech; -int rc =0 ; +int i, rc =0 ; - rc =cifs_alloc_hash ("hmac(sha256)" , - &p->hmacsha256, - &p->sdeschmacsha256); -if (rc) -return rc; +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &p->hmacsha256[i], + &p->sdeschmacsha256[i]); +if (rc) + goto fail; - rc =cifs_alloc_hash ("cmac(aes)" , &p->cmacaes, &p->sdesccmacaes); -if (rc) - goto err; + rc =cifs_alloc_hash ("cmac(aes)" , + &p->cmacaes[i], &p->sdesccmacaes[i]); +if (rc) + goto fail; + } rc =cifs_alloc_hash ("sha512" , &p->sha512, &p->sdescsha512);if (rc) - goto err; + goto fail;return 0 ; -err: -cifs_free_hash (&p->cmacaes, &p->sdesccmacaes); -cifs_free_hash (&p->hmacsha256, &p->sdeschmacsha256); +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +cifs_free_hash (&p->hmacsha256[i], &p->sdeschmacsha256[i]); +cifs_free_hash (&p->cmacaes[i], &p->sdesccmacaes[i]); + }return rc; }@@ -219,7 +245,8 @@ smb2_find_smb_tcon(struct TCP_Server_Info*server,
__u64ses_id,__u32tid)fs/cifs/smb2transport.c smb2_find_smb_tcon(struct TCP_Server_Info · line 222
Quoted 4 lines
fs/cifs/smb2transport.c +0
-1}int -smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server)
fs/cifs/smb2transport.c smb2_find_smb_tcon(struct TCP_Server_Info · line 248
Quoted 1 line
fs/cifs/smb2transport.c +1
-0+smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server,
fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst, struct
Quoted 5 lines
fs/cifs/smb2transport.c +1
-0+ int direction) {int rc;unsigned char smb2_signature[SMB2_HMACSHA256_SIZE ];@@ -229,6 +256,7 @@ smb2_calc_signature(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst, struct
Quoted 8 lines
fs/cifs/smb2transport.c +1
-0struct cifs_ses *ses;struct shash_desc *shash;struct smb_rqst drqst; +struct crypto_shash *hmacsha256; ses =smb2_find_smb_ses (server, shdr->SessionId);if (!ses) {@@ -245,14 +273,16 @@ smb2_calc_signature(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
Quoted 10 lines
fs/cifs/smb2transport.c +3
-1return rc; } - rc =crypto_shash_setkey (server->secmech.hmacsha256, + hmacsha256 = server->secmech.hmacsha256[direction]; + + rc =crypto_shash_setkey (hmacsha256, ses->auth_key.response,SMB2_NTLMV2_SESSKEY_SIZE );if (rc) { cifs_server_dbg(VFS, "%s: Could not update with response\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1return rc; } - shash = &server->secmech.sdeschmacsha256->shash; + shash = &server->secmech.sdeschmacsha256[direction]->shash; rc =crypto_shash_init (shash);if (rc) {cifs_server_dbg (VFS ,"%s: Could not init sha256" , __func__);@@ -296,6 +326,8 @@ static int generate_key(struct cifs_ses *ses, structkvec label,
fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct
Quoted 9 lines
fs/cifs/smb2transport.c +2
-0unsigned char prfhash[SMB2_HMACSHA256_SIZE ];unsigned char *hashptr = prfhash;struct TCP_Server_Info *server = ses->server; +struct crypto_shash *hmacsha256; +struct sdesc *sdeschmacsha256;memset (prfhash,0x0 ,SMB2_HMACSHA256_SIZE );memset (key,0x0 , key_size);@@ -306,55 +338,58 @@ static int generate_key(struct cifs_ses *ses, structkvec label,
fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 13 lines
fs/cifs/smb2transport.c +4
-1goto smb3signkey_ret; } - rc =crypto_shash_setkey (server->secmech.hmacsha256, + hmacsha256 = server- secmech.hmacsha256[CIFS_SECMECH_DIR_OUT ]; + sdeschmacsha256 = server- secmech.sdeschmacsha256[CIFS_SECMECH_DIR_OUT ]; + + rc =crypto_shash_setkey (hmacsha256, ses->auth_key.response,SMB2_NTLMV2_SESSKEY_SIZE );if (rc) { cifs_server_dbg(VFS, "%s: Could not set with session key\n",
__func__);Quoted 15 lines
fs/cifs/smb2transport.c +2
-2goto smb3signkey_ret; } - rc =crypto_shash_init (&server->secmech.sdeschmacsha256->shash); + rc =crypto_shash_init (&sdeschmacsha256->shash);if (rc) {cifs_server_dbg (VFS ,"%s: Could not init sign hmac\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, i,4 );if (rc) {fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 10 lines
fs/cifs/smb2transport.c +1
-1cifs_server_dbg (VFS ,"%s: Could not update with n\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, label.iov_base, label.iov_len);if (rc) { cifs_server_dbg(VFS, "%s: Could not update with label\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, &zero,1 );if (rc) { cifs_server_dbg(VFS, "%s: Could not update with zero\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, context.iov_base, context.iov_len);if (rc) { cifs_server_dbg(VFS, "%s: Could not update with context\n",
__func__);Quoted 12 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash,L ,4 );if (rc) {cifs_server_dbg (VFS ,"%s: Could not update with L\n" , __func__);goto smb3signkey_ret; }fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 5 lines
fs/cifs/smb2transport.c +1
-1- rc =crypto_shash_final (&server->secmech.sdeschmacsha256->shash, + rc =crypto_shash_final (&sdeschmacsha256->shash, hashptr);if (rc) { cifs_server_dbg(VFS, "%s: Could not generate sha256 hash\n",
__func__);fs/cifs/smb2transport.c generate_smb311signingkey(struct cifs_ses *ses) · line 507
Quoted 5 lines
fs/cifs/smb2transport.c +0
-1@@ -504,16 +539,18 @@ generate_smb311signingkey(struct cifs_ses *ses) }int -smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server)
fs/cifs/smb2transport.c generate_smb311signingkey(struct cifs_ses *ses) · line 542
Quoted 1 line
fs/cifs/smb2transport.c +1
-0+smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server,
fs/cifs/smb2transport.c smb3_calc_signature(struct smb_rqst *rqst, struct
Quoted 16 lines
fs/cifs/smb2transport.c +3
-1+ int direction) {int rc;unsigned char smb3_signature[SMB2_CMACAES_SIZE ];unsigned char *sigptr = smb3_signature;struct kvec *iov = rqst->rq_iov;struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0 ].iov_base; -struct shash_desc *shash = &server->secmech.sdesccmacaes->shash; +struct shash_desc *shash;struct smb_rqst drqst;u8 key[SMB3_SIGN_KEY_SIZE ]; +struct crypto_shash *cmacaes; rc =smb2_get_sign_key (shdr->SessionId, server, key);if (rc)@@ -522,8 +559,10 @@ smb3_calc_signature(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
Quoted 11 lines
fs/cifs/smb2transport.c +4
-2memset (smb3_signature,0x0 ,SMB2_CMACAES_SIZE );memset (shdr->Signature,0x0 ,SMB2_SIGNATURE_SIZE ); - rc =crypto_shash_setkey (server->secmech.cmacaes, - key,SMB2_CMACAES_SIZE ); + cmacaes = server->secmech.cmacaes[direction]; + shash = &server->secmech.sdesccmacaes[direction]->shash; + + rc =crypto_shash_setkey (cmacaes, key,SMB2_CMACAES_SIZE );if (rc) { cifs_server_dbg(VFS, "%s: Could not set key for cmac aes\n",
__func__);fs/cifs/smb2transport.c smb2_sign_rqst(struct smb_rqst *rqst, struct
Quoted 2 lines
fs/cifs/smb2transport.c +0
-0return rc;@@ -593,8 +632,7 @@ smb2_sign_rqst(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server)
Quoted 6 lines
fs/cifs/smb2transport.c +1
-2return 0 ; } - rc = server->ops->calc_signature (rqst, server); - + rc = server->ops->calc_signature(rqst, server,
CIFS_SECMECH_DIR_OUT);fs/cifs/smb2transport.c smb2_verify_signature(struct smb_rqst *rqst, struct
Quoted 4 lines
fs/cifs/smb2transport.c +0
-0return rc; }@@ -631,9 +669,7 @@ smb2_verify_signature(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) · line 672
Quoted 7 lines
fs/cifs/smb2transport.c +1
-3memset (shdr->Signature,0 ,SMB2_SIGNATURE_SIZE ); -mutex_lock (&server->srv_mutex); - rc = server->ops->calc_signature (rqst, server); -mutex_unlock (&server->srv_mutex); + rc = server->ops->calc_signature (rqst, server,CIFS_SECMECH_DIR_IN );
Quoted 4 lines
Multiple threads may be calling
smb2_verify_signaturefromsmb2_check_receivein separate threads (seecompound_send_recv). What will prevent races on crypto data structures once the mutex aroundcalc_signatureis removed?
It's my bad I will fix it. In this case we need another mutex for the receiving paths. I was looking at smb2_writev_callback() and smb2_readv_callback(), they are called from cifsd and also use this mutex. This mutex does the most damage in those two callback functions as it may block the receiving thread.
Thanks,
Long
Quoted 4 lines
--
Best regards,
Pavel Shilovsky
Wonder if we should add a separate documentation patch to cifsglob.h to extend the descriptions of what the various locks and semaphores are supposed to protect to include what you noticed? See below
* Locking notes. All updates to global variables and lists should be
* protected by spinlocks or semaphores.
*
* Spinlocks * --------- * GlobalMid_Lock protects: * list operations on pending_mid_q and oplockQ * updates to XID counters, multiplex id and SMB sequence numbers * list operations on global DnotifyReqList * tcp_ses_lock protects: * list operations on tcp and SMB session lists * tcon->open_file_lock protects the list of open files hanging off the tcon * inode->open_file_lock protects the openFileList hanging off the inode * cfile->file_info_lock protects counters and fields in cifs file struct * f_owner.lock protects certain per file struct operations * mapping->page_lock protects certain per page operations * * Note that the cifs_tcon.open_file_lock should be taken before * not after the cifsInodeInfo.open_file_lock * * Semaphores * ---------- * sesSem operations on smb session * tconSem operations on tree connection * fh_sem file handle reconnection operations
Quoted 460 lines · Long Li
Quoted 446 lines
Subject: Re: [PATCH] cifs: Remove locking in
smb2_verify_signature()when calculating SMB2/SMB3 signature on receiving packetsср, 25 мар. 2020 г. в 11:15, <[email protected]>:
Quoted 7 lines
From: Long Li <[email protected]>
On the sending and receiving paths, CIFS uses the same cypto data structures to calculate SMB2/SMB3 packet signatures. A lock on the receiving path is necessary to control shared access to crypto data structures. This lock degrades performance because it races with the
sending path.
Quoted 112 lines
Define separate crypto data structures for sending and receiving paths and remove this lock.
Signed-off-by Long Li <[email protected]>--- fs/cifs/cifsencrypt.c | 29 +++++---- fs/cifs/cifsglob.h | 21 +++++-- fs/cifs/smb2proto.h | 4 +- fs/cifs/smb2transport.c | 130 +++++++++++++++++++++++++--------------- 4 files changed, 119 insertions(+), 65 deletions(-)fs/cifs/cifsencrypt.c index renamed from fs/cifs/cifsencrypt.c +0
-0
97b7497c13ef..222e8d13302c100644fs/cifs/cifsencrypt.c +18
-7@@ -804,16 +804,27 @@ calc_seckey(struct cifs_ses *ses) void cifs_crypto_secmech_release(struct TCP_Server_Info *server) { -if (server->secmech.cmacaes) { -crypto_free_shash (server->secmech.cmacaes); - server->secmech.cmacaes =NULL ; - } +int i; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +if (server->secmech.cmacaes[i]) { +crypto_free_shash (server->secmech.cmacaes[i]); + server->secmech.cmacaes[i] =NULL ; + } -if (server->secmech.hmacsha256) { -crypto_free_shash (server->secmech.hmacsha256); - server->secmech.hmacsha256 =NULL ; +if (server->secmech.hmacsha256[i]) { +crypto_free_shash (server->secmech.hmacsha256[i]); + server->secmech.hmacsha256[i] =NULL ; + } + +kfree (server->secmech.sdesccmacaes[i]); + server->secmech.sdesccmacaes[i] =NULL ; + +kfree (server->secmech.sdeschmacsha256[i]); + server->secmech.sdeschmacsha256[i] =NULL ; } +if (server->secmech.md5) {crypto_free_shash (server->secmech.md5); server->secmech.md5 = NULL; @@ -839,10 +850,6 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server) server->secmech.ccmaesdecrypt =NULL ;}fs/cifs/cifsencrypt.c +0
-4-kfree (server->secmech.sdesccmacaes); - server->secmech.sdesccmacaes =NULL ; -kfree (server->secmech.sdeschmacsha256); - server->secmech.sdeschmacsha256 =NULL ;kfree (server->secmech.sdeschmacmd5); server->secmech.sdeschmacmd5 =NULL ; kfree(server->secmech.sdescmd5); diff --git
a/fs/cifs/cifsglob.hb/fs/cifs/cifsglob.hindex0d956360e984..e31a902ebadc100644fs/cifs/cifsglob.h +16
-5@@ -137,17 +137,27 @@ struct sdesc {char ctx[]; }; +enum { +CIFS_SECMECH_DIR_IN =0 , +CIFS_SECMECH_DIR_OUT , +CIFS_SECMECH_DIR_MAX +}; +/* crypto hashing related structure/fields, not specific to a sec mech */ struct cifs_secmech {struct crypto_shash *hmacmd5;/* hmac-md5 hash function */ struct crypto_shash *md5;/* md5 hash function */ -struct crypto_shash *hmacsha256;/* hmac-sha256 hash function */ -struct crypto_shash *cmacaes;/* block-cipher based MAC function */ +/* hmac-sha256 hash functions */ +struct crypto_shash *hmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* block-cipher based MAC function */ +struct crypto_shash *cmacaes[CIFS_SECMECH_DIR_MAX ];struct crypto_shash *sha512;/* sha512 hash function */ struct sdesc *sdeschmacmd5;/* ctxt to generate ntlmv2 hash, CR1 */ struct sdesc *sdescmd5;/* ctxt to generate cifs/smb signature */ -struct sdesc *sdeschmacsha256;/* ctxt to generate smb2 signature */ -struct sdesc *sdesccmacaes;/* ctxt to generate smb3 signature */ +/* ctxt to generate smb2 signature */ +struct sdesc *sdeschmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* ctxt to generate smb3 signature */ +struct sdesc *sdesccmacaes[CIFS_SECMECH_DIR_MAX ];struct sdesc *sdescsha512;/* ctxt to generate smb3.11 signing key */ struct crypto_aead *ccmaesencrypt;/* smb3 encryption aead */ struct crypto_aead *ccmaesdecrypt;/* smb3 decryption aead */ @@ -426,7 +436,8 @@ struct smb_version_operations {/* generate new lease key */ void (*new_lease_key)(struct cifs_fid *);int (*generate_signingkey)(struct cifs_ses *); -int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *); +int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *, +int direction);int (*set_integrity)(const unsigned int ,struct cifs_tcon *tcon,struct cifsFileInfo *src_file); int (*enum_snapshots)(const unsigned int xid, struct cifs_tcon*tcon, diff --git
a/fs/cifs/smb2proto.hb/fs/cifs/smb2proto.hindex4d1ff7b66fdc..f5edd6ea3639100644fs/cifs/smb2proto.h +0
-0@@ -55,9 +55,9 @@ extern struct cifs_ses *smb2_find_smb_ses(structQuoted 1 line
TCP_Server_Info*server, extern structcifs_tcon*smb2_find_smb_tcon(struct
TCP_Server_Info*server,fs/cifs/smb2transport.c smb2_find_smb_tcon(struct TCP_Server_Info
Quoted 127 lines
__u64 ses_id, __u32tid); extern int smb2_calc_signature(struct
smb_rqst*rqst,fs/cifs/smb2proto.h +4
-2- struct TCP_Server_Info *server); +struct TCP_Server_Info *server, int + direction);extern int smb3_calc_signature (struct smb_rqst *rqst, -struct TCP_Server_Info *server); +struct TCP_Server_Info *server,int + direction); extern void smb2_echo_request(struct work_struct *work); extern
__le32smb2_get_lease_state(struct cifsInodeInfo *cinode); extern bool smb2_is_valid_oplock_break(char *buffer, diff --gita/fs/cifs/smb2transport.cb/fs/cifs/smb2transport.cindex08b703b7a15e..c8ba40d8fedf100644fs/cifs/smb2transport.c +53
-27@@ -43,30 +43,51 @@static int smb2_crypto_shash_allocate (struct TCP_Server_Info *server) { -return cifs_alloc_hash ("hmac(sha256)" , - &server->secmech.hmacsha256, - &server->secmech.sdeschmacsha256); +int i, rc; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &server->secmech.hmacsha256[i], + &server->secmech.sdeschmacsha256[i]); +if (rc) + goto fail; + } +return 0 ; + +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) +cifs_free_hash ( + &server->secmech.hmacsha256[i], + &server->secmech.sdeschmacsha256[i]); +return rc; }static int smb3_crypto_shash_allocate (struct TCP_Server_Info *server) {struct cifs_secmech *p = &server->secmech; -int rc; +int i, rc; - rc =cifs_alloc_hash ("hmac(sha256)" , - &p->hmacsha256, - &p->sdeschmacsha256); -if (rc) - goto err; +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &p->hmacsha256[i], + &p->sdeschmacsha256[i]); +if (rc) + goto fail; - rc =cifs_alloc_hash ("cmac(aes)" , &p->cmacaes, &p->sdesccmacaes); -if (rc) - goto err; + rc =cifs_alloc_hash ("cmac(aes)" , + &p->cmacaes[i], &p->sdesccmacaes[i]); +if (rc) + goto fail; + }return 0 ; -err: -cifs_free_hash (&p->hmacsha256, &p->sdeschmacsha256); + +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +cifs_free_hash (&p->hmacsha256[i], &p->sdeschmacsha256[i]); +cifs_free_hash (&p->cmacaes[i], &p->sdesccmacaes[i]); + }return rc; }@@ -74,27 +95,32 @@ int smb311_crypto_shash_allocate(struct TCP_Server_Info *server) {struct cifs_secmech *p = &server->secmech; -int rc =0 ; +int i, rc =0 ; - rc =cifs_alloc_hash ("hmac(sha256)" , - &p->hmacsha256, - &p->sdeschmacsha256); -if (rc) -return rc; +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &p->hmacsha256[i], + &p->sdeschmacsha256[i]); +if (rc) + goto fail; - rc =cifs_alloc_hash ("cmac(aes)" , &p->cmacaes, &p->sdesccmacaes); -if (rc) - goto err; + rc =cifs_alloc_hash ("cmac(aes)" , + &p->cmacaes[i], &p->sdesccmacaes[i]); +if (rc) + goto fail; + } rc =cifs_alloc_hash ("sha512" , &p->sha512, &p->sdescsha512);if (rc) - goto err; + goto fail;return 0 ; -err: -cifs_free_hash (&p->cmacaes, &p->sdesccmacaes); -cifs_free_hash (&p->hmacsha256, &p->sdeschmacsha256); +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +cifs_free_hash (&p->hmacsha256[i], &p->sdeschmacsha256[i]); +cifs_free_hash (&p->cmacaes[i], &p->sdesccmacaes[i]); + }return rc; }@@ -219,7 +245,8 @@ smb2_find_smb_tcon(struct TCP_Server_Info*server,
__u64ses_id,__u32tid)fs/cifs/smb2transport.c smb2_find_smb_tcon(struct TCP_Server_Info · line 222
Quoted 4 lines
fs/cifs/smb2transport.c +0
-1}int -smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server)
fs/cifs/smb2transport.c smb2_find_smb_tcon(struct TCP_Server_Info · line 248
Quoted 1 line
fs/cifs/smb2transport.c +1
-0+smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server,
fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst, struct
Quoted 5 lines
fs/cifs/smb2transport.c +1
-0+ int direction) {int rc;unsigned char smb2_signature[SMB2_HMACSHA256_SIZE ];@@ -229,6 +256,7 @@ smb2_calc_signature(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst, struct
Quoted 8 lines
fs/cifs/smb2transport.c +1
-0struct cifs_ses *ses;struct shash_desc *shash;struct smb_rqst drqst; +struct crypto_shash *hmacsha256; ses =smb2_find_smb_ses (server, shdr->SessionId);if (!ses) {@@ -245,14 +273,16 @@ smb2_calc_signature(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
Quoted 10 lines
fs/cifs/smb2transport.c +3
-1return rc; } - rc =crypto_shash_setkey (server->secmech.hmacsha256, + hmacsha256 = server->secmech.hmacsha256[direction]; + + rc =crypto_shash_setkey (hmacsha256, ses->auth_key.response,SMB2_NTLMV2_SESSKEY_SIZE );if (rc) { cifs_server_dbg(VFS, "%s: Could not update with response\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1return rc; } - shash = &server->secmech.sdeschmacsha256->shash; + shash = &server->secmech.sdeschmacsha256[direction]->shash; rc =crypto_shash_init (shash);if (rc) {cifs_server_dbg (VFS ,"%s: Could not init sha256" , __func__);@@ -296,6 +326,8 @@ static int generate_key(struct cifs_ses *ses, structkvec label,
fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct
Quoted 9 lines
fs/cifs/smb2transport.c +2
-0unsigned char prfhash[SMB2_HMACSHA256_SIZE ];unsigned char *hashptr = prfhash;struct TCP_Server_Info *server = ses->server; +struct crypto_shash *hmacsha256; +struct sdesc *sdeschmacsha256;memset (prfhash,0x0 ,SMB2_HMACSHA256_SIZE );memset (key,0x0 , key_size);@@ -306,55 +338,58 @@ static int generate_key(struct cifs_ses *ses, structkvec label,
fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 13 lines
fs/cifs/smb2transport.c +4
-1goto smb3signkey_ret; } - rc =crypto_shash_setkey (server->secmech.hmacsha256, + hmacsha256 = server- secmech.hmacsha256[CIFS_SECMECH_DIR_OUT ]; + sdeschmacsha256 = server- secmech.sdeschmacsha256[CIFS_SECMECH_DIR_OUT ]; + + rc =crypto_shash_setkey (hmacsha256, ses->auth_key.response,SMB2_NTLMV2_SESSKEY_SIZE );if (rc) { cifs_server_dbg(VFS, "%s: Could not set with session key\n",
__func__);Quoted 15 lines
fs/cifs/smb2transport.c +2
-2goto smb3signkey_ret; } - rc =crypto_shash_init (&server->secmech.sdeschmacsha256->shash); + rc =crypto_shash_init (&sdeschmacsha256->shash);if (rc) {cifs_server_dbg (VFS ,"%s: Could not init sign hmac\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, i,4 );if (rc) {fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 10 lines
fs/cifs/smb2transport.c +1
-1cifs_server_dbg (VFS ,"%s: Could not update with n\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, label.iov_base, label.iov_len);if (rc) { cifs_server_dbg(VFS, "%s: Could not update with label\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, &zero,1 );if (rc) { cifs_server_dbg(VFS, "%s: Could not update with zero\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, context.iov_base, context.iov_len);if (rc) { cifs_server_dbg(VFS, "%s: Could not update with context\n",
__func__);Quoted 12 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash,L ,4 );if (rc) {cifs_server_dbg (VFS ,"%s: Could not update with L\n" , __func__);goto smb3signkey_ret; }fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 5 lines
fs/cifs/smb2transport.c +1
-1- rc =crypto_shash_final (&server->secmech.sdeschmacsha256->shash, + rc =crypto_shash_final (&sdeschmacsha256->shash, hashptr);if (rc) { cifs_server_dbg(VFS, "%s: Could not generate sha256 hash\n",
__func__);fs/cifs/smb2transport.c generate_smb311signingkey(struct cifs_ses *ses) · line 507
Quoted 5 lines
fs/cifs/smb2transport.c +0
-1@@ -504,16 +539,18 @@ generate_smb311signingkey(struct cifs_ses *ses) }int -smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server)
fs/cifs/smb2transport.c generate_smb311signingkey(struct cifs_ses *ses) · line 542
Quoted 1 line
fs/cifs/smb2transport.c +1
-0+smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server,
fs/cifs/smb2transport.c smb3_calc_signature(struct smb_rqst *rqst, struct
Quoted 16 lines
fs/cifs/smb2transport.c +3
-1+ int direction) {int rc;unsigned char smb3_signature[SMB2_CMACAES_SIZE ];unsigned char *sigptr = smb3_signature;struct kvec *iov = rqst->rq_iov;struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0 ].iov_base; -struct shash_desc *shash = &server->secmech.sdesccmacaes->shash; +struct shash_desc *shash;struct smb_rqst drqst;u8 key[SMB3_SIGN_KEY_SIZE ]; +struct crypto_shash *cmacaes; rc =smb2_get_sign_key (shdr->SessionId, server, key);if (rc)@@ -522,8 +559,10 @@ smb3_calc_signature(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
Quoted 11 lines
fs/cifs/smb2transport.c +4
-2memset (smb3_signature,0x0 ,SMB2_CMACAES_SIZE );memset (shdr->Signature,0x0 ,SMB2_SIGNATURE_SIZE ); - rc =crypto_shash_setkey (server->secmech.cmacaes, - key,SMB2_CMACAES_SIZE ); + cmacaes = server->secmech.cmacaes[direction]; + shash = &server->secmech.sdesccmacaes[direction]->shash; + + rc =crypto_shash_setkey (cmacaes, key,SMB2_CMACAES_SIZE );if (rc) { cifs_server_dbg(VFS, "%s: Could not set key for cmac aes\n",
__func__);fs/cifs/smb2transport.c smb2_sign_rqst(struct smb_rqst *rqst, struct
Quoted 2 lines
fs/cifs/smb2transport.c +0
-0return rc;@@ -593,8 +632,7 @@ smb2_sign_rqst(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server)
Quoted 6 lines
fs/cifs/smb2transport.c +1
-2return 0 ; } - rc = server->ops->calc_signature (rqst, server); - + rc = server->ops->calc_signature(rqst, server,
CIFS_SECMECH_DIR_OUT);fs/cifs/smb2transport.c smb2_verify_signature(struct smb_rqst *rqst, struct
Quoted 4 lines
fs/cifs/smb2transport.c +0
-0return rc; }@@ -631,9 +669,7 @@ smb2_verify_signature(struct smb_rqst *rqst, struct
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) · line 672
Quoted 7 lines
fs/cifs/smb2transport.c +1
-3memset (shdr->Signature,0 ,SMB2_SIGNATURE_SIZE ); -mutex_lock (&server->srv_mutex); - rc = server->ops->calc_signature (rqst, server); -mutex_unlock (&server->srv_mutex); + rc = server->ops->calc_signature (rqst, server,CIFS_SECMECH_DIR_IN );Quoted 4 lines
Multiple threads may be calling
smb2_verify_signaturefromsmb2_check_receivein separate threads (seecompound_send_recv). What will prevent races on crypto data structures once the mutex aroundcalc_signatureis removed?It's my bad I will fix it. In this case we need another mutex for the receiving paths. I was looking at
smb2_writev_callback()andsmb2_readv_callback(), they are called from cifsd and also use this mutex. This mutex does the most damage in those two callback functions as it may block the receiving thread.Thanks,
LongQuoted 4 lines
--
Best regards,
Pavel Shilovsky
Signature · 3 lines
Thanks, Steve
Quoted 6 lines
Subject: Re: [PATCH] cifs: Remove locking in
smb2_verify_signature()when calculating SMB2/SMB3 signature on receiving packetsWonder if we should add a separate documentation patch to
cifsglob.hto extend the descriptions of what the various locks and semaphores are supposed to protect to include what you noticed? See below
Yes, I will send this patch.
Quoted 517 lines
* Locking notes. All updates to global variables and lists should be
* protected by spinlocks or semaphores.
** Spinlocks * --------- * GlobalMid_Lock protects: * list operations on pending_mid_q and oplockQ * updates to XID counters, multiplex id and SMB sequence numbers * list operations on global DnotifyReqList * tcp_ses_lock protects: * list operations on tcp and SMB session lists * tcon->open_file_lock protects the list of open files hanging off the tcon * inode->open_file_lock protects the openFileList hanging off the inode * cfile->file_info_lock protects counters and fields in cifs file struct * f_owner.lock protects certain per file struct operations * mapping->page_lock protects certain per page operations*
* Note that the cifs_tcon.open_file_lock should be taken before
* not after the cifsInodeInfo.open_file_lock
** Semaphores * ---------- * sesSem operations on smb session * tconSem operations on tree connection * fh_sem file handle reconnection operationsQuoted 83 lines · Long Li
Quoted 83 lines
Subject: Re: [PATCH] cifs: Remove locking in
smb2_verify_signature()when calculating SMB2/SMB3 signature on receiving packetsср, 25 мар. 2020 г. в 11:15, <[email protected]>:
Quoted 8 lines
From: Long Li <[email protected]>
On the sending and receiving paths, CIFS uses the same cypto data structures to calculate SMB2/SMB3 packet signatures. A lock on the receiving path is necessary to control shared access to crypto data structures. This lock degrades performance because it races with the
sending path.
Quoted 69 lines
Define separate crypto data structures for sending and receiving paths and remove this lock.
Signed-off-by Long Li <[email protected]>--- fs/cifs/cifsencrypt.c | 29 +++++---- fs/cifs/cifsglob.h | 21 +++++-- fs/cifs/smb2proto.h | 4 +- fs/cifs/smb2transport.c | 130 +++++++++++++++++++++++++--------------- 4 files changed, 119 insertions(+), 65 deletions(-)fs/cifs/cifsencrypt.c index renamed from fs/cifs/cifsencrypt.c +0
-0
97b7497c13ef..222e8d13302c100644fs/cifs/cifsencrypt.c +18
-7@@ -804,16 +804,27 @@ calc_seckey(struct cifs_ses *ses) void cifs_crypto_secmech_release(struct TCP_Server_Info *server) { -if (server->secmech.cmacaes) { -crypto_free_shash (server->secmech.cmacaes); - server->secmech.cmacaes =NULL ; - } +int i; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +if (server->secmech.cmacaes[i]) { +crypto_free_shash (server->secmech.cmacaes[i]); + server->secmech.cmacaes[i] =NULL ; + } -if (server->secmech.hmacsha256) { -crypto_free_shash (server->secmech.hmacsha256); - server->secmech.hmacsha256 =NULL ; +if (server->secmech.hmacsha256[i]) { +crypto_free_shash (server->secmech.hmacsha256[i]); + server->secmech.hmacsha256[i] =NULL ; + } + +kfree (server->secmech.sdesccmacaes[i]); + server->secmech.sdesccmacaes[i] =NULL ; + +kfree (server->secmech.sdeschmacsha256[i]); + server->secmech.sdeschmacsha256[i] =NULL ; } +if (server->secmech.md5) {crypto_free_shash (server->secmech.md5); server->secmech.md5 = NULL; @@ -839,10 +850,6 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server) server->secmech.ccmaesdecrypt =NULL ;}fs/cifs/cifsencrypt.c +0
-4-kfree (server->secmech.sdesccmacaes); - server->secmech.sdesccmacaes =NULL ; -kfree (server->secmech.sdeschmacsha256); - server->secmech.sdeschmacsha256 =NULL ;kfree (server->secmech.sdeschmacmd5); server->secmech.sdeschmacmd5 =NULL ; kfree(server->secmech.sdescmd5); diff --git
a/fs/cifs/cifsglob.hb/fs/cifs/cifsglob.hindex0d956360e984..e31a902ebadc100644fs/cifs/cifsglob.h +0
-0@@ -137,17 +137,27 @@ struct sdesc {char ctx[]; };Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
fs/cifs/cifsglob.h +4
-0+enum { +CIFS_SECMECH_DIR_IN =0 , +CIFS_SECMECH_DIR_OUT , +CIFS_SECMECH_DIR_MAX Quoted 8 lines
fs/cifs/cifsglob.h struct sdesc {
Quoted 8 lines
fs/cifs/cifsglob.h +2
-2+}; +/* crypto hashing related structure/fields, not specific to a sec mech */ struct cifs_secmech {struct crypto_shash *hmacmd5;/* hmac-md5 hash function */ struct crypto_shash *md5;/* md5 hash function */ -struct crypto_shash *hmacsha256;/* hmac-sha256 hash function */ -struct crypto_shash *cmacaes;/* block-cipher based MAC function */
Quoted 6 lines
Quoted 6 lines
fs/cifs/cifsglob.h struct sdesc {
Quoted 6 lines
fs/cifs/cifsglob.h +4
-0+/* hmac-sha256 hash functions */ +struct crypto_shash *hmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* block-cipher based MAC function */ +struct crypto_shash *cmacaes[CIFS_SECMECH_DIR_MAX ];struct crypto_shash *sha512;/* sha512 hash function */ struct sdesc *sdeschmacmd5;/* ctxt to generate ntlmv2 hash, CR1 */
Quoted 2 lines
Quoted 2 lines
fs/cifs/cifsglob.h struct sdesc { · line 149
Quoted 2 lines
fs/cifs/cifsglob.h +0
-1struct sdesc *sdescmd5;/* ctxt to generate cifs/smb signature */ -struct sdesc *sdeschmacsha256;/* ctxt to generate smb2 signature */
Quoted 157 lines
Quoted 157 lines
Quoted 24 lines
fs/cifs/cifsglob.h +4
-1-struct sdesc *sdesccmacaes;/* ctxt to generate smb3 signature */ +/* ctxt to generate smb2 signature */ +struct sdesc *sdeschmacsha256[CIFS_SECMECH_DIR_MAX ]; +/* ctxt to generate smb3 signature */ +struct sdesc *sdesccmacaes[CIFS_SECMECH_DIR_MAX ];struct sdesc *sdescsha512;/* ctxt to generate smb3.11 signing key */ struct crypto_aead *ccmaesencrypt;/* smb3 encryption aead */ struct crypto_aead *ccmaesdecrypt;/* smb3 decryption aead */ @@ -426,7 +436,8 @@ struct smb_version_operations { /* generate new lease key */ void (*new_lease_key)(struct cifs_fid *); int (*generate_signingkey)(struct cifs_ses *);fs/cifs/cifsglob.h +2
-1-int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *); +int (*calc_signature)(struct smb_rqst *,struct TCP_Server_Info *, +int direction);int (*set_integrity)(const unsigned int ,struct cifs_tcon *tcon,struct cifsFileInfo *src_file); int (*enum_snapshots)(const unsigned int xid, struct
cifs_tcon*tcon, diff --gita/fs/cifs/smb2proto.hb/fs/cifs/smb2proto.hindex4d1ff7b66fdc..f5edd6ea3639100644fs/cifs/smb2proto.h +0
-0@@ -55,9 +55,9 @@ extern struct cifs_ses *smb2_find_smb_ses(structQuoted 1 line
TCP_Server_Info*server, extern structcifs_tcon*smb2_find_smb_tcon(struct
TCP_Server_Info*server,fs/cifs/smb2transport.c smb2_find_smb_tcon(struct TCP_Server_Info
Quoted 126 lines
__u64 ses_id, __u32tid); extern int smb2_calc_signature(struct
smb_rqst*rqst,fs/cifs/smb2proto.h +4
-2- struct TCP_Server_Info *server); +struct TCP_Server_Info *server, int + direction);extern int smb3_calc_signature (struct smb_rqst *rqst, -struct TCP_Server_Info *server); +struct TCP_Server_Info *server,int + direction); extern void smb2_echo_request(struct work_struct *work); extern
__le32smb2_get_lease_state(struct cifsInodeInfo *cinode); extern bool smb2_is_valid_oplock_break(char *buffer, diff --gita/fs/cifs/smb2transport.cb/fs/cifs/smb2transport.cindex08b703b7a15e..c8ba40d8fedf100644fs/cifs/smb2transport.c +53
-27@@ -43,30 +43,51 @@static int smb2_crypto_shash_allocate (struct TCP_Server_Info *server) { -return cifs_alloc_hash ("hmac(sha256)" , - &server->secmech.hmacsha256, - &server->secmech.sdeschmacsha256); +int i, rc; + +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &server->secmech.hmacsha256[i], + &server->secmech.sdeschmacsha256[i]); +if (rc) + goto fail; + } +return 0 ; + +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) +cifs_free_hash ( + &server->secmech.hmacsha256[i], + &server->secmech.sdeschmacsha256[i]); +return rc; }static int smb3_crypto_shash_allocate (struct TCP_Server_Info *server) {struct cifs_secmech *p = &server->secmech; -int rc; +int i, rc; - rc =cifs_alloc_hash ("hmac(sha256)" , - &p->hmacsha256, - &p->sdeschmacsha256); -if (rc) - goto err; +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &p->hmacsha256[i], + &p->sdeschmacsha256[i]); +if (rc) + goto fail; - rc =cifs_alloc_hash ("cmac(aes)" , &p->cmacaes, &p->sdesccmacaes); -if (rc) - goto err; + rc =cifs_alloc_hash ("cmac(aes)" , + &p->cmacaes[i], &p->sdesccmacaes[i]); +if (rc) + goto fail; + }return 0 ; -err: -cifs_free_hash (&p->hmacsha256, &p->sdeschmacsha256); + +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +cifs_free_hash (&p->hmacsha256[i], &p->sdeschmacsha256[i]); +cifs_free_hash (&p->cmacaes[i], &p->sdesccmacaes[i]); + }return rc; }@@ -74,27 +95,32 @@ int smb311_crypto_shash_allocate(struct TCP_Server_Info *server) {struct cifs_secmech *p = &server->secmech; -int rc =0 ; +int i, rc =0 ; - rc =cifs_alloc_hash ("hmac(sha256)" , - &p->hmacsha256, - &p->sdeschmacsha256); -if (rc) -return rc; +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { + rc =cifs_alloc_hash ("hmac(sha256)" , + &p->hmacsha256[i], + &p->sdeschmacsha256[i]); +if (rc) + goto fail; - rc =cifs_alloc_hash ("cmac(aes)" , &p->cmacaes, &p->sdesccmacaes); -if (rc) - goto err; + rc =cifs_alloc_hash ("cmac(aes)" , + &p->cmacaes[i], &p->sdesccmacaes[i]); +if (rc) + goto fail; + } rc =cifs_alloc_hash ("sha512" , &p->sha512, &p->sdescsha512);if (rc) - goto err; + goto fail;return 0 ; -err: -cifs_free_hash (&p->cmacaes, &p->sdesccmacaes); -cifs_free_hash (&p->hmacsha256, &p->sdeschmacsha256); +fail: +for (i =CIFS_SECMECH_DIR_IN ; i <CIFS_SECMECH_DIR_MAX ; i++) { +cifs_free_hash (&p->hmacsha256[i], &p->sdeschmacsha256[i]); +cifs_free_hash (&p->cmacaes[i], &p->sdesccmacaes[i]); + }return rc; }@@ -219,7 +245,8 @@ smb2_find_smb_tcon(struct TCP_Server_Info*server,
__u64ses_id,__u32tid)Quoted 4 lines
fs/cifs/smb2transport.c +0
-1}int -smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_InfoQuoted 8 lines
Quoted 8 lines
*server)
fs/cifs/smb2transport.c smb2_find_smb_tcon(struct TCP_Server_Info · line 248
Quoted 1 line
fs/cifs/smb2transport.c +1
-0+smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server,
fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst,
Quoted 5 lines
fs/cifs/smb2transport.c +1
-0+ int direction) {int rc;unsigned char smb2_signature[SMB2_HMACSHA256_SIZE ];@@ -229,6 +256,7 @@ smb2_calc_signature(struct smb_rqst *rqst,struct
Quoted 9 lines
Quoted 9 lines
TCP_Server_Info*server)fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst,
Quoted 8 lines
fs/cifs/smb2transport.c +1
-0struct cifs_ses *ses;struct shash_desc *shash;struct smb_rqst drqst; +struct crypto_shash *hmacsha256; ses =smb2_find_smb_ses (server, shdr->SessionId);if (!ses) {@@ -245,14 +273,16 @@ smb2_calc_signature(struct smb_rqst *rqst,struct
Quoted 9 lines
Quoted 9 lines
TCP_Server_Info*server)Quoted 8 lines
fs/cifs/smb2transport.c +3
-1return rc; } - rc = crypto_shash_setkey(server->secmech.hmacsha256, + hmacsha256 = server->secmech.hmacsha256[direction]; + + rc = crypto_shash_setkey(hmacsha256, ses->auth_key.response,
SMB2_NTLMV2_SESSKEY_SIZE);Quoted 19 lines
Quoted 19 lines
fs/cifs/smb2transport.c smb2_calc_signature(struct smb_rqst *rqst, · line 281
Quoted 2 lines
fs/cifs/smb2transport.c +0
-0if (rc) { cifs_server_dbg(VFS, "%s: Could not update with response\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1return rc; } - shash = &server->secmech.sdeschmacsha256->shash; + shash = &server->secmech.sdeschmacsha256[direction]->shash; rc =crypto_shash_init (shash);if (rc) {cifs_server_dbg (VFS ,"%s: Could not init sha256" , __func__);@@ -296,6 +326,8 @@ static int generate_key(struct cifs_ses *ses, structkvec label,
Quoted 6 lines
fs/cifs/smb2transport.c +2
-0unsigned char prfhash[SMB2_HMACSHA256_SIZE ];unsigned char *hashptr = prfhash;struct TCP_Server_Info *server = ses->server; +struct crypto_shash *hmacsha256; +struct sdesc *sdeschmacsha256;Quoted 3 lines
Quoted 3 lines
fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses,
Quoted 3 lines
fs/cifs/smb2transport.c +0
-0memset (prfhash,0x0 ,SMB2_HMACSHA256_SIZE );memset (key,0x0 , key_size);@@ -306,55 +338,58 @@ static int generate_key(struct cifs_ses *ses,struct
Quoted 14 lines
Quoted 14 lines
kvec label,
Quoted 13 lines
fs/cifs/smb2transport.c +4
-1goto smb3signkey_ret; } - rc =crypto_shash_setkey (server->secmech.hmacsha256, + hmacsha256 = server- secmech.hmacsha256[CIFS_SECMECH_DIR_OUT ]; + sdeschmacsha256 = server- secmech.sdeschmacsha256[CIFS_SECMECH_DIR_OUT ]; + + rc =crypto_shash_setkey (hmacsha256, ses->auth_key.response,SMB2_NTLMV2_SESSKEY_SIZE );if (rc) { cifs_server_dbg(VFS, "%s: Could not set with session key\n",Quoted 18 lines
Quoted 5 lines
__func__);Quoted 4 lines
fs/cifs/smb2transport.c +0
-1goto smb3signkey_ret; } - rc = crypto_shash_init(&server->secmech.sdeschmacsha256-shash);
Quoted 12 lines
Quoted 12 lines
fs/cifs/smb2transport.c +2
-1+ rc =crypto_shash_init (&sdeschmacsha256->shash);if (rc) {cifs_server_dbg (VFS ,"%s: Could not init sign hmac\n" , __func__); goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, i,4 );if (rc) { cifs_server_dbg(VFS, "%s: Could not update with n\n",
__func__);Quoted 33 lines
Quoted 33 lines
fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, label.iov_base, label.iov_len);if (rc) { cifs_server_dbg(VFS, "%s: Could not update with label\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, &zero,1 );if (rc) { cifs_server_dbg(VFS, "%s: Could not update with zero\n",
__func__);fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 9 lines
fs/cifs/smb2transport.c +1
-1goto smb3signkey_ret; } - rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash, context.iov_base, context.iov_len);if (rc) { cifs_server_dbg(VFS, "%s: Could not update with context\n",
__func__);Quoted 3 lines
fs/cifs/smb2transport.c +0
-0goto smb3signkey_ret; }Quoted 6 lines
Quoted 6 lines
fs/cifs/smb2transport.c static int generate_key(struct cifs_ses *ses, struct kvec label,
Quoted 6 lines
fs/cifs/smb2transport.c +1
-1- rc =crypto_shash_update (&server->secmech.sdeschmacsha256- shash, + rc =crypto_shash_update (&sdeschmacsha256->shash,L ,4 );if (rc) { cifs_server_dbg(VFS, "%s: Could not update with L\n",
__func__);Quoted 11 lines
Quoted 4 lines
Quoted 4 lines
goto smb3signkey_ret; }- rc = crypto_shash_final(&server->secmech.sdeschmacsha256-
shash,
Quoted 6 lines
Quoted 4 lines
+ rc = crypto_shash_final(&sdeschmacsha256->shash,
hashptr); if (rc) { cifs_server_dbg(VFS, "%s: Could not generate sha256 hash\n",
__func__);fs/cifs/smb2transport.c generate_smb311signingkey(struct cifs_ses
Quoted 1 line
fs/cifs/smb2transport.c +0
-0@@ -504,16 +539,18 @@ generate_smb311signingkey(struct cifs_ses*ses)
Quoted 6 lines
Quoted 6 lines
fs/cifs/smb2transport.c generate_smb311signingkey(struct cifs_ses · line 507
Quoted 4 lines
fs/cifs/smb2transport.c +0
-1}int -smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info*server)
Quoted 1 line
fs/cifs/smb2transport.c +1
-0+smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_InfoQuoted 8 lines
Quoted 8 lines
*server,
Quoted 7 lines
fs/cifs/smb2transport.c +1
-0+ int direction) {int rc;unsigned char smb3_signature[SMB2_CMACAES_SIZE ];unsigned char *sigptr = smb3_signature;struct kvec *iov = rqst->rq_iov; struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr*)iov[0].iov_base;
Quoted 10 lines
Quoted 1 line
fs/cifs/smb2transport.c generate_smb311signingkey(struct cifs_ses · line 514
Quoted 1 line
fs/cifs/smb2transport.c +0
-1- struct shash_desc *shash = &server->secmech.sdesccmacaes-shash;
Quoted 8 lines
fs/cifs/smb2transport.c smb3_calc_signature(struct smb_rqst *rqst,
Quoted 8 lines
fs/cifs/smb2transport.c +2
-0+struct shash_desc *shash;struct smb_rqst drqst;u8 key[SMB3_SIGN_KEY_SIZE ]; +struct crypto_shash *cmacaes; rc =smb2_get_sign_key (shdr->SessionId, server, key);if (rc)@@ -522,8 +559,10 @@ smb3_calc_signature(struct smb_rqst *rqst,struct
Quoted 19 lines
Quoted 19 lines
TCP_Server_Info*server)fs/cifs/smb2transport.c smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
Quoted 11 lines
fs/cifs/smb2transport.c +4
-2memset (smb3_signature,0x0 ,SMB2_CMACAES_SIZE );memset (shdr->Signature,0x0 ,SMB2_SIGNATURE_SIZE ); - rc =crypto_shash_setkey (server->secmech.cmacaes, - key,SMB2_CMACAES_SIZE ); + cmacaes = server->secmech.cmacaes[direction]; + shash = &server->secmech.sdesccmacaes[direction]->shash; + + rc =crypto_shash_setkey (cmacaes, key,SMB2_CMACAES_SIZE );if (rc) { cifs_server_dbg(VFS, "%s: Could not set key for cmac aes\n",
__func__);fs/cifs/smb2transport.c smb2_sign_rqst(struct smb_rqst *rqst, struct
Quoted 2 lines
fs/cifs/smb2transport.c +0
-0return rc;@@ -593,8 +632,7 @@ smb2_sign_rqst(struct smb_rqst *rqst, struct
TCP_Server_Info*server)Quoted 3 lines
fs/cifs/smb2transport.c +0
-0return 0 ; }Quoted 8 lines
Quoted 8 lines
fs/cifs/smb2transport.c smb2_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server)
Quoted 3 lines
fs/cifs/smb2transport.c +1
-2- rc = server->ops->calc_signature (rqst, server); - + rc = server->ops->calc_signature(rqst, server,
CIFS_SECMECH_DIR_OUT);fs/cifs/smb2transport.c smb2_verify_signature(struct smb_rqst *rqst,
Quoted 4 lines
fs/cifs/smb2transport.c +0
-0return rc; }@@ -631,9 +669,7 @@ smb2_verify_signature(struct smb_rqst *rqst,struct
Quoted 8 lines
Quoted 8 lines
TCP_Server_Info*server)Quoted 7 lines
fs/cifs/smb2transport.c +1
-3memset (shdr->Signature,0 ,SMB2_SIGNATURE_SIZE ); -mutex_lock (&server->srv_mutex); - rc = server->ops->calc_signature (rqst, server); -mutex_unlock (&server->srv_mutex); + rc = server->ops->calc_signature(rqst, server,
CIFS_SECMECH_DIR_IN);Quoted 3 lines
Quoted 3 lines
Multiple threads may be calling
smb2_verify_signaturefromsmb2_check_receivein separate threads (seecompound_send_recv).What
Quoted 4 lines
Quoted 2 lines
will prevent races on crypto data structures once the mutex around
calc_signatureis removed?It's my bad I will fix it. In this case we need another mutex for the receiving
paths. I was looking at
smb2_writev_callback()andsmb2_readv_callback(), they are called from cifsd and also use this mutex. This mutex does the most damage in those two callback functions as it may block the receiving thread.Quoted 8 lines
Thanks,
LongQuoted 4 lines
--
Best regards,
Pavel Shilovsky--
Thanks,Steve
Quoted 7 lines · [email protected] writes:
On the sending and receiving paths, CIFS uses the same cypto data structures to calculate SMB2/SMB3 packet signatures. A lock on the receiving path is necessary to control shared access to crypto data structures. This lock degrades performance because it races with the sending path.
Define separate crypto data structures for sending and receiving paths and remove this lock.
Something I've often wondered: why do we keep crypto state in the server structure instead of creating it as needed in the caller stack (thus avoiding the need for locks). AFAIK there's no state that need to be kept between signing/encrypting calls beside the access to keys. Is it that expensive to create/release?
Cheers,
Signature · 4 lines
Aurélien Aptel / SUSE Labs Samba Team GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)
Quoted 10 lines
Subject: Re: [PATCH] cifs: Remove locking in
smb2_verify_signature()when calculating SMB2/SMB3 signature on receiving packetsQuoted 4 lines · [email protected] writes:
On the sending and receiving paths, CIFS uses the same cypto data structures to calculate SMB2/SMB3 packet signatures. A lock on the receiving path is necessary to control shared access to crypto data structures. This lock degrades performance because it races with the
sending path.
Quoted 1 line
Quoted 8 lines
Quoted 2 lines
Define separate crypto data structures for sending and receiving paths and remove this lock.
Something I've often wondered: why do we keep crypto state in the server structure instead of creating it as needed in the caller stack (thus avoiding the need for locks). AFAIK there's no state that need to be kept between signing/encrypting calls beside the access to keys. Is it that expensive to create/release?
My guess is that crypto_alloc_shash() is a heavy call?
Quoted 7 lines
Cheers,
--
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)
Quoted 5 lines · Long Li
Quoted 3 lines
need for locks). AFAIK there's no state that need to be kept between signing/encrypting calls beside the access to keys. Is it that expensive to create/release?
My guess is that
crypto_alloc_shash()is a heavy call?
AFAIK there's no IO, just some memory allocation. Could be faster than locking. Something to look into, maybe...
Cheers,
Signature · 4 lines
Aurélien Aptel / SUSE Labs Samba Team GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)