From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6F1B312832; Wed, 18 Feb 2026 21:36:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771450618; cv=none; b=O7Pv8QwB9BukV7U6FHIVtAXzdVN9+8bv+y3rV/52PHNm+GwzcqhogZacRXN+XmKpmOQZt+YQL26DJcvaqDVXuF6eELPCy/1eRIaqbQbWU70aXw6IwMG89AoKDXU/jwf5fi45n5eMBUUlxmICxM4WUzp+Uj/Ba+K6Sl2+yK2Kgrk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771450618; c=relaxed/simple; bh=yUsqjSnPbDX/S+rnsu/6yIO+0mII4wRuFeRbW6zNwMQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QZE1lrHWcMVCv2kQ7OE/oBnv7BKe3E48Van5UpK7ipFrWlEBF5nQ9nc73lAvTgq8jmrGD3JQalZKU5KeVLbmV6csmWYErnWl8tYTvwoI3us8jbrQQ626ZvaFXNxoxPmvCzSiIyKyiIgyM2GrZvsVwWHxK9061y3PLj4cOMWl/qI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kmNioAnd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kmNioAnd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE83AC2BCAF; Wed, 18 Feb 2026 21:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771450617; bh=yUsqjSnPbDX/S+rnsu/6yIO+0mII4wRuFeRbW6zNwMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kmNioAndIDtJqj5zX9UyQqC8ga+DPfMLGWcDMmKgmWKPeQ6Q/tAv1kutYsfIc/rdO LQc6vHbw6C4wUcfk79joquORCE6pT+BwnMNBpRz35c1b2dIWQU+mUHBoeUUpHHchyi vCFdheo5Gr2gOFWWh91VetqLe8BHP3ojSeB/m9Pa9pCjP7cYfZiv2M9q0O7EXkoV98 wmhrjyLDJijMQwri+QwicxPTllfq3HVOV4byCCYumyD6TD5KbOUoeNAzTmRzBOEBsw fsl7PXcZvEXEnGPr1/zMWgIe9cTmfaW5UkU/BVNVmge+NzCT6vQT5nTuvpKkpoQSZs J1hK43sD4g2ZQ== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , Herbert Xu , linux-arm-kernel@lists.infradead.org, linux-cifs@vger.kernel.org, linux-wireless@vger.kernel.org, Eric Biggers Subject: [PATCH 11/15] smb: client: Drop 'allocate_crypto' arg from smb*_calc_signature() Date: Wed, 18 Feb 2026 13:34:57 -0800 Message-ID: <20260218213501.136844-12-ebiggers@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260218213501.136844-1-ebiggers@kernel.org> References: <20260218213501.136844-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Since the crypto library API is now being used instead of crypto_shash, all structs for MAC computation are now just fixed-size structs allocated on the stack; no dynamic allocations are ever required. Besides being much more efficient, this also means that the 'allocate_crypto' argument to smb2_calc_signature() and smb3_calc_signature() is no longer used. Remove this unused argument. Signed-off-by: Eric Biggers --- fs/smb/client/smb2transport.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/smb/client/smb2transport.c b/fs/smb/client/smb2transport.c index 0176185a1efc..41009039b4cb 100644 --- a/fs/smb/client/smb2transport.c +++ b/fs/smb/client/smb2transport.c @@ -202,12 +202,11 @@ smb2_find_smb_tcon(struct TCP_Server_Info *server, __u64 ses_id, __u32 tid) return tcon; } static int -smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server, - bool allocate_crypto) +smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) { int rc; unsigned char smb2_signature[SMB2_HMACSHA256_SIZE]; struct kvec *iov = rqst->rq_iov; struct smb2_hdr *shdr = (struct smb2_hdr *)iov[0].iov_base; @@ -438,12 +437,11 @@ generate_smb311signingkey(struct cifs_ses *ses, return generate_smb3signingkey(ses, server, &triplet); } static int -smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server, - bool allocate_crypto) +smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) { int rc; unsigned char smb3_signature[SMB2_CMACAES_SIZE]; struct kvec *iov = rqst->rq_iov; struct smb2_hdr *shdr = (struct smb2_hdr *)iov[0].iov_base; @@ -451,11 +449,11 @@ smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server, struct aes_cmac_ctx cmac_ctx; struct smb_rqst drqst; u8 key[SMB3_SIGN_KEY_SIZE]; if (server->vals->protocol_id <= SMB21_PROT_ID) - return smb2_calc_signature(rqst, server, allocate_crypto); + return smb2_calc_signature(rqst, server); rc = smb3_get_sign_key(le64_to_cpu(shdr->SessionId), server, key); if (unlikely(rc)) { cifs_server_dbg(FYI, "%s: Could not get signing key\n", __func__); return rc; @@ -522,11 +520,11 @@ smb2_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server) if (!is_binding && !server->session_estab) { strscpy(shdr->Signature, "BSRSPYL"); return 0; } - return smb3_calc_signature(rqst, server, false); + return smb3_calc_signature(rqst, server); } int smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) { @@ -558,11 +556,11 @@ smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) */ memcpy(server_response_sig, shdr->Signature, SMB2_SIGNATURE_SIZE); memset(shdr->Signature, 0, SMB2_SIGNATURE_SIZE); - rc = smb3_calc_signature(rqst, server, true); + rc = smb3_calc_signature(rqst, server); if (rc) return rc; if (crypto_memneq(server_response_sig, shdr->Signature, -- 2.53.0