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 B7B0619CD03 for ; Sun, 10 May 2026 14:22:53 +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=1778422973; cv=none; b=SXC1EHFcT90K8PGS3T78fzZlQm7r2QvMAO0N19YS82BVRyp+lYcQUik9xcy+g8k9MKCY7eam+rAMJUkM3CTRjQFxo+HTg1StmcaRa1qeNPXeSgMV5n8wyqjx8eM8IClQvBDRQx06r6YPfhCkcHBB8mSTN0DSP0V7rE5J5YMzuXg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778422973; c=relaxed/simple; bh=MozqkfsY7tvakyiyCbk3blMP3/7P68kDdR3JFqKnqns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ICz07ZVY74yKk2FdCPDJp8Zqc297EhkhAUDm/PXL6dSAdugkNdYnFPAOXAwSurUG4yz1+4HWydsqgQCBF2Vw9rebUguNvvR8dd+ps+ykXOCye5KZ7IBx2LOjN9VekOq+GDVOcxfIbg/JLefDRPnW+jdo/eXvdFE/cP934mLafiA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KHxG0LWa; 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="KHxG0LWa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26E30C2BCB8; Sun, 10 May 2026 14:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778422973; bh=MozqkfsY7tvakyiyCbk3blMP3/7P68kDdR3JFqKnqns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KHxG0LWaCfmakMnUcbrC+cqIifzCsKLiD8kcwb5ghtkwelapWH1YVt5VX9c0oqTgH qb7xPKjwweyuFJxlH3SAtoL/s2YEMmc/saHViDB2hUCgPl4oOkIA2DFDpXNGH3A84k KH85HVlwt84Vd4zUZwyBXT+Pl/sfNuz2Rbs4SfZGs2sI6D6Hb5B26HhQU2weWZD+Dd qKGQM2yqMONvDl4lUjJJYSuCDf54N/Sm2BlCezMWdbIQMba4wgNucAXGcK+TQ/sMQV F0t29TBPN7a4RaVaghMQQgw4asHuM/QpBl77xI79HMXZ/U84WITdYUVUVCW0jC4IM/ RmNz9Lm4zJB+g== From: Sasha Levin To: stable@vger.kernel.org Cc: Thorsten Blum , Herbert Xu , Sasha Levin Subject: [PATCH 6.1.y 2/2] crypto: caam - guard HMAC key hex dumps in hash_digest_key Date: Sun, 10 May 2026 10:22:50 -0400 Message-ID: <20260510142250.4179491-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260510142250.4179491-1-sashal@kernel.org> References: <2026050437-exorcism-sensitive-efda@gregkh> <20260510142250.4179491-1-sashal@kernel.org> 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 177730a273b18e195263ed953853273e901b5064 ] Use print_hex_dump_devel() for dumping sensitive HMAC key bytes in hash_digest_key() to avoid leaking secrets at runtime when CONFIG_DYNAMIC_DEBUG is enabled. Fixes: 045e36780f11 ("crypto: caam - ahash hmac support") Fixes: 3f16f6c9d632 ("crypto: caam/qi2 - add support for ahash algorithms") Cc: stable@vger.kernel.org Signed-off-by: Thorsten Blum Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/caam/caamalg_qi2.c | 4 ++-- drivers/crypto/caam/caamhash.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c index 56058d4992cc4..0fcc4067980b6 100644 --- a/drivers/crypto/caam/caamalg_qi2.c +++ b/drivers/crypto/caam/caamalg_qi2.c @@ -3264,7 +3264,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, u32 *keylen, u8 *key, dpaa2_fl_set_addr(out_fle, key_dma); dpaa2_fl_set_len(out_fle, digestsize); - print_hex_dump_debug("key_in@" __stringify(__LINE__)": ", + print_hex_dump_devel("key_in@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, key, *keylen, 1); print_hex_dump_debug("shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), @@ -3284,7 +3284,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, u32 *keylen, u8 *key, /* in progress */ wait_for_completion(&result.completion); ret = result.err; - print_hex_dump_debug("digested key@" __stringify(__LINE__)": ", + print_hex_dump_devel("digested key@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, key, digestsize, 1); } diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 36ef738e4a181..25eabcadc4abb 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -390,7 +390,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, u32 *keylen, u8 *key, append_seq_store(desc, digestsize, LDST_CLASS_2_CCB | LDST_SRCDST_BYTE_CONTEXT); - print_hex_dump_debug("key_in@"__stringify(__LINE__)": ", + print_hex_dump_devel("key_in@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, key, *keylen, 1); print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), @@ -405,7 +405,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, u32 *keylen, u8 *key, wait_for_completion(&result.completion); ret = result.err; - print_hex_dump_debug("digested key@"__stringify(__LINE__)": ", + print_hex_dump_devel("digested key@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, key, digestsize, 1); } -- 2.53.0