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 CE91D3DD500 for ; Wed, 18 Mar 2026 14:36:24 +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=1773844584; cv=none; b=WYm7kdueiJ2BbQwOWwzKr4r2zzMlpvRMBvnGIZdT3Op72/sIyuMRp4x/uWqv5swxQCWzTzMrYvZfwrgqEB5M7ebsbyB4TgDiOa9VXNwbXLQuOXP9KHXKmKvJ55U5QrJhAtiQb3vC0MW4bTYWdufgathrnOHqJYwDhhSNwF/vwSU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773844584; c=relaxed/simple; bh=Au4AqFwGb3/I2t3VZdV2Rq7CIszDwN3LFAzQgIMMxTA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B/Rbei9zf4aCDDaYczKBEq89bY4r2kT9/yTlQovg0sXFAY6zNY2f0SayHWJGsfylVyq95UMFWtNXCqxR7pDUA0imjph7Mg3L7BCL1p0fyZ79nc24bXmsN2NRG9DU0cJU2h6eQB1FFacgewJA8LugPiK0D5IHat5FtDsnpruop04= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M3fEkyx2; 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="M3fEkyx2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A49BCC2BC87; Wed, 18 Mar 2026 14:36:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773844584; bh=Au4AqFwGb3/I2t3VZdV2Rq7CIszDwN3LFAzQgIMMxTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M3fEkyx2NAmuCFGN+uIs5DyaCh3wKx/riL63WG4p+B+/Os37DfoaUQIX02An78tNW 9cCl09AF3C/PPVffZ2U14Y/Qvd8TwjzInEFqQc1pFR0CJpU6lh888zfbHV8JwmclRz s1fq4Wm9l8BQ0CFRla9dPel4r2GhPcHM3DnLwBiAxnkT6JBD67Iu/dgUCPFZFm8Tfk luf8T1Me6wIyqdY+uYJPGrFufUaeJ0Vs5vIEgg8u5nHPf0rejihWXwuL52f15EY8o4 Iro1oL7myu23vCVWuRz0rGkv1ZkT7MbfTZdBDhYW/opG9rsG1Gl4iPrKzc7Wb+8mWP ol4Fvb/YswiFw== From: Sasha Levin To: stable@vger.kernel.org Cc: Thorsten Blum , Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 6.12.y] ksmbd: Don't log keys in SMB3 signing and encryption key generation Date: Wed, 18 Mar 2026 10:36:20 -0400 Message-ID: <20260318143620.844352-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026031717-borrowing-hamburger-4b1a@gregkh> References: <2026031717-borrowing-hamburger-4b1a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Thorsten Blum [ Upstream commit 441336115df26b966575de56daf7107ed474faed ] When KSMBD_DEBUG_AUTH logging is enabled, generate_smb3signingkey() and generate_smb3encryptionkey() log the session, signing, encryption, and decryption key bytes. Remove the logs to avoid exposing credentials. Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3") Cc: stable@vger.kernel.org Signed-off-by: Thorsten Blum Acked-by: Namjae Jeon Signed-off-by: Steve French [ Context ] Signed-off-by: Sasha Levin --- fs/smb/server/auth.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/fs/smb/server/auth.c b/fs/smb/server/auth.c index b3d121052408c..a561d0703ed16 100644 --- a/fs/smb/server/auth.c +++ b/fs/smb/server/auth.c @@ -801,12 +801,8 @@ static int generate_smb3signingkey(struct ksmbd_session *sess, if (!(conn->dialect >= SMB30_PROT_ID && signing->binding)) memcpy(chann->smb3signingkey, key, SMB3_SIGN_KEY_SIZE); - ksmbd_debug(AUTH, "dumping generated AES signing keys\n"); + ksmbd_debug(AUTH, "generated SMB3 signing key\n"); ksmbd_debug(AUTH, "Session Id %llu\n", sess->id); - ksmbd_debug(AUTH, "Session Key %*ph\n", - SMB2_NTLMV2_SESSKEY_SIZE, sess->sess_key); - ksmbd_debug(AUTH, "Signing Key %*ph\n", - SMB3_SIGN_KEY_SIZE, key); return 0; } @@ -870,23 +866,9 @@ static int generate_smb3encryptionkey(struct ksmbd_conn *conn, if (rc) return rc; - ksmbd_debug(AUTH, "dumping generated AES encryption keys\n"); + ksmbd_debug(AUTH, "generated SMB3 encryption/decryption keys\n"); ksmbd_debug(AUTH, "Cipher type %d\n", conn->cipher_type); ksmbd_debug(AUTH, "Session Id %llu\n", sess->id); - ksmbd_debug(AUTH, "Session Key %*ph\n", - SMB2_NTLMV2_SESSKEY_SIZE, sess->sess_key); - if (conn->cipher_type == SMB2_ENCRYPTION_AES256_CCM || - conn->cipher_type == SMB2_ENCRYPTION_AES256_GCM) { - ksmbd_debug(AUTH, "ServerIn Key %*ph\n", - SMB3_GCM256_CRYPTKEY_SIZE, sess->smb3encryptionkey); - ksmbd_debug(AUTH, "ServerOut Key %*ph\n", - SMB3_GCM256_CRYPTKEY_SIZE, sess->smb3decryptionkey); - } else { - ksmbd_debug(AUTH, "ServerIn Key %*ph\n", - SMB3_GCM128_CRYPTKEY_SIZE, sess->smb3encryptionkey); - ksmbd_debug(AUTH, "ServerOut Key %*ph\n", - SMB3_GCM128_CRYPTKEY_SIZE, sess->smb3decryptionkey); - } return 0; } -- 2.51.0