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 75C2B33FE1F; Mon, 23 Mar 2026 14:42:33 +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=1774276953; cv=none; b=onR8n29DzMJQo8tBGEJR29Pbdfg49Ub70Y35jBwBpUB6zj/zQV9fMEAloqXxUmR6UgfHD7e+xpgHhw1q1mFaxAv1DjnrvM8qjo2Tbe1OpOSWqidjurGRxj1C6S8ngVg+3C9drb6h2HjVn0Kzi60M4dFidGc6oxPHJuWLpPGNdRo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774276953; c=relaxed/simple; bh=or2hPoX4gWpUMtegZhvZB6f5kGROhT56gKxKuIyMNCg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sHBZm9rJpQleQLlyXXbSvAVz03D7os0rvFEQ15mSrH9kN/hHQ3rlS4cw1EJIXC3F2DG752yEKF9la2T2ErOZyNj43FJz4UEwkemmrMTC+6CV7+vQQ5+KgHTQYRkT7H1LqwbE1kABXopGC7S8tubsADgMxPBBdJzEDknXKDgdssY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HQ/8pBZS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HQ/8pBZS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3320C4CEF7; Mon, 23 Mar 2026 14:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774276953; bh=or2hPoX4gWpUMtegZhvZB6f5kGROhT56gKxKuIyMNCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HQ/8pBZSx0CkO7ypbGbC2M7FG6n1aPYezxhTeqPEcw4beHkVys47l3lp2CEt3b/rG m8ZJFR/2Uc+SbYv0mO/2OM5ykRo92Qe/2QitxcdGrk1Z1pQwqJ2BgB1mqqOq22MFjX 3UKXZRWb4l7x7+xrn0Tfs8fiB6EL5tw1QeWOj8mg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thorsten Blum , Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 6.12 267/460] ksmbd: Dont log keys in SMB3 signing and encryption key generation Date: Mon, 23 Mar 2026 14:44:23 +0100 Message-ID: <20260323134533.049050412@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134526.647552166@linuxfoundation.org> References: <20260323134526.647552166@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- fs/smb/server/auth.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) --- a/fs/smb/server/auth.c +++ b/fs/smb/server/auth.c @@ -803,12 +803,8 @@ static int generate_smb3signingkey(struc 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; } @@ -872,23 +868,9 @@ static int generate_smb3encryptionkey(st 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; }