iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cifs: fix check of rc in function generate_smb3signingkey

Browse Source 
Remove extra check after condition, add check after generating key
for encryption. The check is needed to return non zero rc before
rewriting it with generating key for decryption.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Reviewed-by: Paulo Alcantara (SUSE) <pc@manguebit.com>
Fixes: d70e9fa55884 ("cifs: try opening channels after mounting")
Signed-off-by: Ekaterina Esina <eesina@astralinux.ru>
Co-developed-by: Anastasia Belova <abelova@astralinux.ru>
Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Ekaterina Esina 2023-11-13 19:42:41 +03:00 committed by Steve French
parent ff31ba19d7
commit 181724fc72
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/smb/client/smb2transport.c
View File

@ -458,6 +458,8 @@ generate_smb3signingkey(struct cifs_ses *ses,
ptriplet->encryption.context, ptriplet->encryption.context,
ses->smb3encryptionkey, ses->smb3encryptionkey,
SMB3_ENC_DEC_KEY_SIZE); SMB3_ENC_DEC_KEY_SIZE);
if (rc)
return rc;
rc = generate_key(ses, ptriplet->decryption.label, rc = generate_key(ses, ptriplet->decryption.label,
ptriplet->decryption.context, ptriplet->decryption.context,
ses->smb3decryptionkey, ses->smb3decryptionkey,
@ -466,9 +468,6 @@ generate_smb3signingkey(struct cifs_ses *ses,
return rc; return rc;
} }
if (rc)
return rc;
#ifdef CONFIG_CIFS_DEBUG_DUMP_KEYS #ifdef CONFIG_CIFS_DEBUG_DUMP_KEYS
cifs_dbg(VFS, "%s: dumping generated AES session keys\n", __func__); cifs_dbg(VFS, "%s: dumping generated AES session keys\n", __func__);
/* /*