From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 678CCC388F9 for ; Tue, 27 Oct 2020 18:05:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 117DB2076D for ; Tue, 27 Oct 2020 18:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603821944; bh=Qxk7ecoRBzI3JUIWBl1bDNmUJduHtMupdpCYUykTlQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jmTNKNSBOjoVor4t2aWCw8eWs1Ho0eHU/KJ/3YOqeLmp4q+LRBCnCGsMuXXXQGyrA Rm0/+4lFBP9qUeov1AnwwxKTNQzUfifvJpWLbhtAICbO7P88U5SK/buit+CKFLA1Ea mhrpyAbZxt3Z352J/MslzU8cW9hJVFcegb0wu1xk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1824761AbgJ0SFm (ORCPT ); Tue, 27 Oct 2020 14:05:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:41048 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2508851AbgJ0ORt (ORCPT ); Tue, 27 Oct 2020 10:17:49 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 499F3206F7; Tue, 27 Oct 2020 14:17:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808268; bh=Qxk7ecoRBzI3JUIWBl1bDNmUJduHtMupdpCYUykTlQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m+4H4DyCcRefOzfbDjBCCNvO4wVOii+A9OQTjB/EUEZ7mFunl06dULYCqMCzPgyt3 /tmKTuuSOvPl0Rj5WuzkVAvPDOb9OdeJA0jdJ4G3+qcGM/A5RZvqxTeRCdkFu3s/2u vjO6eAHt5T1diXUjlmWb3PJVMLiQ4MZxCvQttWH0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shyam Prasad N , Pavel Shilovsky , Ronnie Sahlberg , Steve French Subject: [PATCH 4.19 028/264] cifs: Return the error from crypt_message when enc/dec key not found. Date: Tue, 27 Oct 2020 14:51:26 +0100 Message-Id: <20201027135431.977905658@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135430.632029009@linuxfoundation.org> References: <20201027135430.632029009@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shyam Prasad N commit 0bd294b55a5de442370c29fa53bab17aef3ff318 upstream. 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 Reviewed-by: Pavel Shilovsky Reviewed-by: Ronnie Sahlberg CC: Stable Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -2730,7 +2730,7 @@ crypt_message(struct TCP_Server_Info *se if (rc) { cifs_dbg(VFS, "%s: Could not get %scryption key\n", __func__, enc ? "en" : "de"); - return 0; + return rc; } rc = smb3_crypto_aead_allocate(server);