{"id":2224816,"url":"http://patchwork.ozlabs.org/api/patches/2224816/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260418221311.67583-4-ebiggers@kernel.org/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260418221311.67583-4-ebiggers@kernel.org>","list_archive_url":null,"date":"2026-04-18T22:13:10","name":"[v2,3/4] smb: client: Make generate_key() return void","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1b221dfb5138fdacfbc76dd463ef44e0999eae81","submitter":{"id":74690,"url":"http://patchwork.ozlabs.org/api/people/74690/?format=json","name":"Eric Biggers","email":"ebiggers@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260418221311.67583-4-ebiggers@kernel.org/mbox/","series":[{"id":500471,"url":"http://patchwork.ozlabs.org/api/series/500471/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=500471","date":"2026-04-18T22:13:07","name":"smb: client: Use AES-CMAC library","version":2,"mbox":"http://patchwork.ozlabs.org/series/500471/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224816/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224816/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-cifs@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=S/V8BVDK;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=linux-cifs+bounces-10905-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=\"S/V8BVDK\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=10.30.226.201"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fymJb1Hs4z1yGs\n\tfor ; Sun, 19 Apr 2026 08:14:55 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 44DD030329A1\n\tfor ; Sat, 18 Apr 2026 22:13:41 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 018EE34C134;\n\tSat, 18 Apr 2026 22:13:39 +0000 (UTC)","from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org\n [10.30.226.201])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id D24FB34B67F;\n\tSat, 18 Apr 2026 22:13:38 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 5906CC4AF09;\n\tSat, 18 Apr 2026 22:13:38 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776550418; cv=none;\n b=Atd44hrhOJrjqcykHWXMlAspFquxuA9T6zBKmdt+wiulpLoTeC7Ozd9Td1SVQiw/BQhZpT2J2vGrVgcxYVPD+S/oDEnJ46c0VrZkETkX+KOtukQ0tgxV+JqRUUrA7B5KfnTrGolsOWdYXXGtcs+mwEqTq0W175KHeio1an4XjV4=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776550418; c=relaxed/simple;\n\tbh=dduO/wo4ls3VYjlBoyPEBSOeyenJwQ8ce38JIdpYdm4=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=r7r4q0rYmL6CSOp1rgdAbYZVYvADxjf9g5FaXY+ubY8yyZ+VSCOfQKK20zY8QPDQTBPGOZn71VhQ5xSSpUN3yIwqUJ01y2XpcwbAe/TH+SdyiyC0u2hd7Z21sj1zYiXeouybhC3JIlEzDF1g9uNXKtJiTKkIZjCLReOm202VjGk=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=S/V8BVDK; arc=none smtp.client-ip=10.30.226.201","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1776550418;\n\tbh=dduO/wo4ls3VYjlBoyPEBSOeyenJwQ8ce38JIdpYdm4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=S/V8BVDKDwlSXU102LG/X4fwc7cAPVYBnsYdqGZNjFSnS+R69L6H7GkvDIDWnYX1L\n\t AXjuCE/YDK26bAq+FhmmYrbX7n/qWspuhoM2vqOIwhDku4ygHk784POtAoIFyKQRoC\n\t l6HA6+kHwEftaRsFElvNQMejsqp4nG9JL0EkIsv1g1a5SzzOtfMjgQ/N4Q4DVkIa32\n\t kBkB2rtmLBuuhvlz1cfnGTTxqwwkjOTVYAiBPORRp0VL97guU0hB+TlLa1eOqswEvF\n\t 3AX2dljmbOB7+MFU5gGQkycJ5+FzWHrrpyWMrO8VyjYJzL0LnlhwIEUqgngZxMTVF8\n\t zRO5eWiMNTr3g==","From":"Eric Biggers ","To":"linux-cifs@vger.kernel.org,\n\tSteve French ","Cc":"linux-crypto@vger.kernel.org,\n\tsamba-technical@lists.samba.org,\n\tlinux-kernel@vger.kernel.org,\n\tArd Biesheuvel ,\n\tPaulo Alcantara ,\n\tRonnie Sahlberg ,\n\tShyam Prasad N ,\n\tTom Talpey ,\n\tBharath SM ,\n\tEric Biggers ","Subject":"[PATCH v2 3/4] smb: client: Make generate_key() return void","Date":"Sat, 18 Apr 2026 15:13:10 -0700","Message-ID":"<20260418221311.67583-4-ebiggers@kernel.org>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260418221311.67583-1-ebiggers@kernel.org>","References":"<20260418221311.67583-1-ebiggers@kernel.org>","Precedence":"bulk","X-Mailing-List":"linux-cifs@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"Since the crypto library API is now being used instead of crypto_shash,\ngenerate_key() can no longer fail. Make it return void and simplify the\ncallers accordingly.\n\nReviewed-by: Ard Biesheuvel \nSigned-off-by: Eric Biggers \n---\n fs/smb/client/smb2transport.c | 45 +++++++++++++----------------------\n 1 file changed, 16 insertions(+), 29 deletions(-)","diff":"diff --git a/fs/smb/client/smb2transport.c b/fs/smb/client/smb2transport.c\nindex 716e58d1b1c92..0176185a1efcb 100644\n--- a/fs/smb/client/smb2transport.c\n+++ b/fs/smb/client/smb2transport.c\n@@ -249,12 +249,12 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server,\n \t\tmemcpy(shdr->Signature, smb2_signature, SMB2_SIGNATURE_SIZE);\n \n \treturn rc;\n }\n \n-static int generate_key(struct cifs_ses *ses, struct kvec label,\n-\t\t\tstruct kvec context, __u8 *key, unsigned int key_size)\n+static void generate_key(struct cifs_ses *ses, struct kvec label,\n+\t\t\t struct kvec context, __u8 *key, unsigned int key_size)\n {\n \tunsigned char zero = 0x0;\n \t__u8 i[4] = {0, 0, 0, 1};\n \t__u8 L128[4] = {0, 0, 0, 128};\n \t__u8 L256[4] = {0, 0, 1, 0};\n@@ -279,11 +279,10 @@ static int generate_key(struct cifs_ses *ses, struct kvec label,\n \t\thmac_sha256_update(&hmac_ctx, L128, 4);\n \t}\n \thmac_sha256_final(&hmac_ctx, prfhash);\n \n \tmemcpy(key, prfhash, key_size);\n-\treturn 0;\n }\n \n struct derivation {\n \tstruct kvec label;\n \tstruct kvec context;\n@@ -298,11 +297,10 @@ struct derivation_triplet {\n static int\n generate_smb3signingkey(struct cifs_ses *ses,\n \t\t\tstruct TCP_Server_Info *server,\n \t\t\tconst struct derivation_triplet *ptriplet)\n {\n-\tint rc;\n \tbool is_binding = false;\n \tint chan_index = 0;\n \n \tspin_lock(&ses->ses_lock);\n \tspin_lock(&ses->chan_lock);\n@@ -329,42 +327,31 @@ generate_smb3signingkey(struct cifs_ses *ses,\n \t * key and store it in the channel as to not overwrite the\n \t * master connection signing key stored in the session\n \t */\n \n \tif (is_binding) {\n-\t\trc = generate_key(ses, ptriplet->signing.label,\n-\t\t\t\t ptriplet->signing.context,\n-\t\t\t\t ses->chans[chan_index].signkey,\n-\t\t\t\t SMB3_SIGN_KEY_SIZE);\n-\t\tif (rc)\n-\t\t\treturn rc;\n+\t\tgenerate_key(ses, ptriplet->signing.label,\n+\t\t\t ptriplet->signing.context,\n+\t\t\t ses->chans[chan_index].signkey,\n+\t\t\t SMB3_SIGN_KEY_SIZE);\n \t} else {\n-\t\trc = generate_key(ses, ptriplet->signing.label,\n-\t\t\t\t ptriplet->signing.context,\n-\t\t\t\t ses->smb3signingkey,\n-\t\t\t\t SMB3_SIGN_KEY_SIZE);\n-\t\tif (rc)\n-\t\t\treturn rc;\n+\t\tgenerate_key(ses, ptriplet->signing.label,\n+\t\t\t ptriplet->signing.context,\n+\t\t\t ses->smb3signingkey, SMB3_SIGN_KEY_SIZE);\n \n \t\t/* safe to access primary channel, since it will never go away */\n \t\tspin_lock(&ses->chan_lock);\n \t\tmemcpy(ses->chans[chan_index].signkey, ses->smb3signingkey,\n \t\t SMB3_SIGN_KEY_SIZE);\n \t\tspin_unlock(&ses->chan_lock);\n \n-\t\trc = generate_key(ses, ptriplet->encryption.label,\n-\t\t\t\t ptriplet->encryption.context,\n-\t\t\t\t ses->smb3encryptionkey,\n-\t\t\t\t SMB3_ENC_DEC_KEY_SIZE);\n-\t\tif (rc)\n-\t\t\treturn rc;\n-\t\trc = generate_key(ses, ptriplet->decryption.label,\n-\t\t\t\t ptriplet->decryption.context,\n-\t\t\t\t ses->smb3decryptionkey,\n-\t\t\t\t SMB3_ENC_DEC_KEY_SIZE);\n-\t\tif (rc)\n-\t\t\treturn rc;\n+\t\tgenerate_key(ses, ptriplet->encryption.label,\n+\t\t\t ptriplet->encryption.context,\n+\t\t\t ses->smb3encryptionkey, SMB3_ENC_DEC_KEY_SIZE);\n+\t\tgenerate_key(ses, ptriplet->decryption.label,\n+\t\t\t ptriplet->decryption.context,\n+\t\t\t ses->smb3decryptionkey, SMB3_ENC_DEC_KEY_SIZE);\n \t}\n \n #ifdef CONFIG_CIFS_DEBUG_DUMP_KEYS\n \tcifs_dbg(VFS, \"%s: dumping generated AES session keys\\n\", __func__);\n \t/*\n@@ -389,11 +376,11 @@ generate_smb3signingkey(struct cifs_ses *ses,\n \t\t\t\tSMB3_GCM128_CRYPTKEY_SIZE, ses->smb3encryptionkey);\n \t\tcifs_dbg(VFS, \"ServerOut Key %*ph\\n\",\n \t\t\t\tSMB3_GCM128_CRYPTKEY_SIZE, ses->smb3decryptionkey);\n \t}\n #endif\n-\treturn rc;\n+\treturn 0;\n }\n \n int\n generate_smb30signingkey(struct cifs_ses *ses,\n \t\t\t struct TCP_Server_Info *server)\n","prefixes":["v2","3/4"]}