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 A00B138C2AE for ; Sat, 9 May 2026 21:30:01 +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=1778362201; cv=none; b=BGXbqMZarKEjzjplkmkAGXQcaFWSCNpnv7gSR2nHc+XDqXY4KZB8JiyVlN9xJvX8kUdAydVs7og3aSEt0dvktvI1zznsNcUiDne0+htEZaxN1BmJ23bGv1jgxMHRVzogsDIYADm7ASelqPW7lvse1GCsh17Pjscbc2u1Wmyxxw8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778362201; c=relaxed/simple; bh=PK96LQRTk4rXiNW3GxipRkW7hEDKbYrovYrmL7WVDRk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AB+g53Jl2bTdZG9761xEv367CDmYzHYt+23OW3OwT1IR7Err/e8Qpp/9n8x2soTo+TpbpSFvby/3yAapMYYsfWmoiM28gjZ1vsOhDkiGfT1SEKu+zjv8VFuZK7/JTlQbHfRqHPV4Bp/Srk25rQXBOATMLpfGSNlxrpxo3iG3vdI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C3ijurXC; 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="C3ijurXC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA777C2BCC7; Sat, 9 May 2026 21:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778362201; bh=PK96LQRTk4rXiNW3GxipRkW7hEDKbYrovYrmL7WVDRk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C3ijurXC9nPbhVLKew3a4iqxYBUAITNiAcdlZU6vEGX4ocbfvs1d0Ios6SDl3IXXp 2wa82hfH46CYeG3l5eHNFzvXnT4jfBpiAOqtmyJhA9F+gIzqow8rheU48zxP4XFqU4 pcNT+KFe7+WMTcli/uXKh9LklOJN72rwlpx1wk0clnF2ZxbE8IoRMBIj/nf4FTAlVa yMuY+mt7ewxVuLfHYeef+sX5foRzkSMLC0DiXgsB0VEUrmYSsIoUf/hQNd8FL9cYyl tUFyXsCV7BbWzFlZUjIGquJcdb0Cm8hLTFh5d8upXrdxApEks4dSsBJWDiT9ftwfUU 2m+vS/boHzN+A== From: Sasha Levin To: stable@vger.kernel.org Cc: Thorsten Blum , Herbert Xu , Sasha Levin Subject: [PATCH 6.18.y 2/2] crypto: caam - guard HMAC key hex dumps in hash_digest_key Date: Sat, 9 May 2026 17:29:57 -0400 Message-ID: <20260509212957.3843722-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260509212957.3843722-1-sashal@kernel.org> References: <2026050436-chastity-emoticon-ecfc@gregkh> <20260509212957.3843722-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 07665494c8758..c97c10cdf207a 100644 --- a/drivers/crypto/caam/caamalg_qi2.c +++ b/drivers/crypto/caam/caamalg_qi2.c @@ -3269,7 +3269,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), @@ -3289,7 +3289,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 053af748be86d..cc942e5ab2799 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -393,7 +393,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), @@ -408,7 +408,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