From: Shyam Prasad N <sprasad@microsoft.com>
Date: Thu, 15 Oct 2020 17:41:31 +0000 (-0700)
Subject: cifs: Return the error from crypt_message when enc/dec key not found.
X-Git-Tag: v5.10.7~1336^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bd294b55a5de442370c29fa53bab17aef3ff318;p=platform%2Fkernel%2Flinux-rpi.git

cifs: Return the error from crypt_message when enc/dec key not found.

In crypt_message, when smb2_get_enc_key returns error, we need to
return the error back to the caller. If not, we end up processing
the message further, causing a kernel oops due to unwarranted access
of memory.

Call Trace:
smb3_receive_transform+0x120/0x870 [cifs]
cifs_demultiplex_thread+0xb53/0xc20 [cifs]
? cifs_handle_standard+0x190/0x190 [cifs]
kthread+0x116/0x130
? kthread_park+0x80/0x80
ret_from_fork+0x1f/0x30

Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
---

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 48657dd..0dfa832 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -3944,7 +3944,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
 	if (rc) {
 		cifs_server_dbg(VFS, "%s: Could not get %scryption key\n", __func__,
 			 enc ? "en" : "de");
-		return 0;
+		return rc;
 	}
 
 	rc = smb3_crypto_aead_allocate(server);