torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

smb: client: allocate crypto only for primary server

Browse Source 
For extra channels, point ->secmech.{enc,dec} to the primary
server ones.

Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Enzo Matsumiya 2024-09-26 14:46:14 -03:00 committed by Steve French
parent b0abcd65ec
commit f7025d8616
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/smb/client/cifsencrypt.c
View File

@ -735,13 +735,18 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server)
cifs_free_hash(&server->secmech.sha512); cifs_free_hash(&server->secmech.sha512);
cifs_free_hash(&server->secmech.hmacmd5); cifs_free_hash(&server->secmech.hmacmd5);
if (server->secmech.enc) { if (!SERVER_IS_CHAN(server)) {
crypto_free_aead(server->secmech.enc); if (server->secmech.enc) {
server->secmech.enc = NULL; crypto_free_aead(server->secmech.enc);
} server->secmech.enc = NULL;
}
if (server->secmech.dec) { if (server->secmech.dec) {
crypto_free_aead(server->secmech.dec); crypto_free_aead(server->secmech.dec);
server->secmech.dec = NULL;
}
} else {
server->secmech.enc = NULL;
server->secmech.dec = NULL; server->secmech.dec = NULL;
} }
} }

10
fs/smb/client/smb2pdu.c
View File

@ -1268,9 +1268,13 @@ SMB2_negotiate(const unsigned int xid,
} }
if (server->cipher_type && !rc) { if (server->cipher_type && !rc) {
rc = smb3_crypto_aead_allocate(server); if (!SERVER_IS_CHAN(server)) {
if (rc) rc = smb3_crypto_aead_allocate(server);
cifs_server_dbg(VFS, "%s: crypto alloc failed, rc=%d\n", __func__, rc); } else {
/* For channels, just reuse the primary server crypto secmech. */
server->secmech.enc = server->primary_server->secmech.enc;
server->secmech.dec = server->primary_server->secmech.dec;
}
} }
neg_exit: neg_exit:
free_rsp_buf(resp_buftype, rsp); free_rsp_buf(resp_buftype, rsp);