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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 830FEC38A2D for ; Mon, 24 Oct 2022 20:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233971AbiJXUO2 (ORCPT ); Mon, 24 Oct 2022 16:14:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233896AbiJXUNs (ORCPT ); Mon, 24 Oct 2022 16:13:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DF9D17066; Mon, 24 Oct 2022 11:31:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7C74BB818D7; Mon, 24 Oct 2022 12:49:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4742C433D7; Mon, 24 Oct 2022 12:49:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615796; bh=lGARC4Nn7ejgyBy9Z2BSKfmVxSfgD1+Vzdjc7iZZwQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o5JM+Vk3aifHMPb9eCnhOAeK9RWFyDvoFhmSm+aEZnNtaEgzLR0QV+mqS+WCHgZnb 4jxkJb7agRAIFnyUpHgHhatVGN9B/v78Q+nLu7Qyj2MBssOrQ62IU0xrt0lyUOEyjl 6uJR7juEX3CfHIo4t6RFGVz7MNzqRH24AXYMrH9Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ronnie Sahlberg , Enzo Matsumiya , Steve French , Sasha Levin Subject: [PATCH 5.15 386/530] cifs: return correct error in ->calc_signature() Date: Mon, 24 Oct 2022 13:32:10 +0200 Message-Id: <20221024113102.534278772@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 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: Enzo Matsumiya [ Upstream commit 09a1f9a168ae1f69f701689429871793174417d2 ] If an error happens while getting the key or session in the ->calc_signature implementations, 0 (success) is returned. Fix it by returning a proper error code. Since it seems to be highly unlikely to happen wrap the rc check in unlikely() too. Reviewed-by: Ronnie Sahlberg Fixes: 32811d242ff6 ("cifs: Start using per session key for smb2/3 for signature generation") Signed-off-by: Enzo Matsumiya Signed-off-by: Steve French Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2transport.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/fs/cifs/smb2transport.c +++ b/fs/cifs/smb2transport.c @@ -221,9 +221,9 @@ smb2_calc_signature(struct smb_rqst *rqs struct smb_rqst drqst; ses = smb2_find_smb_ses(server, shdr->SessionId); - if (!ses) { + if (unlikely(!ses)) { cifs_server_dbg(VFS, "%s: Could not find session\n", __func__); - return 0; + return -ENOENT; } memset(smb2_signature, 0x0, SMB2_HMACSHA256_SIZE); @@ -542,8 +542,10 @@ smb3_calc_signature(struct smb_rqst *rqs u8 key[SMB3_SIGN_KEY_SIZE]; rc = smb2_get_sign_key(shdr->SessionId, server, key); - if (rc) - return 0; + if (unlikely(rc)) { + cifs_server_dbg(VFS, "%s: Could not get signing key\n", __func__); + return rc; + } if (allocate_crypto) { rc = cifs_alloc_hash("cmac(aes)", &hash, &sdesc);