From: Jarkko Sakkinen <jarkko@kernel.org>
To: linux-integrity@vger.kernel.org
Cc: keyrings@vger.kernel.org, James.Bottomley@HansenPartnership.com,
Jarkko Sakkinen <jarkko@kernel.org>,
stable@vger.kernel.org, Mimi Zohar <zohar@linux.ibm.com>,
David Howells <dhowells@redhat.com>,
Paul Moore <paul@paul-moore.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] KEYS: trusted: Do not use WARN when encode fails
Date: Mon, 20 May 2024 02:51:21 +0300 [thread overview]
Message-ID: <20240519235122.3380-4-jarkko@kernel.org> (raw)
In-Reply-To: <20240519235122.3380-1-jarkko@kernel.org>
When asn1_encode_sequence() fails, WARN is not the correct solution.
1. asn1_encode_sequence() is not an internal function (located
in lib/asn1_encode.c).
2. Location is known, which makes the stack trace useless.
3. Results a crash if panic_on_warn is set.
It is also noteworthy that the use of WARN is undocumented, and it
should be avoided unless there is a carefully considered rationale to
use it.
Replace WARN with pr_err, and print the return value instead, which is
only useful piece of information.
Cc: stable@vger.kernel.org # v5.13+
Fixes: f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
security/keys/trusted-keys/trusted_tpm2.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c
index c6882f5d094f..8b7dd73d94c1 100644
--- a/security/keys/trusted-keys/trusted_tpm2.c
+++ b/security/keys/trusted-keys/trusted_tpm2.c
@@ -84,8 +84,9 @@ static int tpm2_key_encode(struct trusted_key_payload *payload,
work1 = payload->blob;
work1 = asn1_encode_sequence(work1, work1 + sizeof(payload->blob),
scratch, work - scratch);
- if (WARN(IS_ERR(work1), "BUG: ASN.1 encoder failed")) {
+ if (IS_ERR(work1)) {
ret = PTR_ERR(work1);
+ pr_err("BUG: ASN.1 encoder failed with %d\n", ret);
goto err;
}
--
2.45.1
prev parent reply other threads:[~2024-05-19 23:51 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-19 23:51 [PATCH 0/3] KEYS: trusted: bug fixes Jarkko Sakkinen
2024-05-19 23:51 ` [PATCH 1/3] tpm: Disable TCG_TPM2_HMAC by default Jarkko Sakkinen
2024-05-21 7:03 ` Vitor Soares
2024-05-21 7:10 ` Jarkko Sakkinen
2024-05-21 12:33 ` James Bottomley
2024-05-21 13:00 ` Jarkko Sakkinen
2024-05-21 13:11 ` Jarkko Sakkinen
2024-05-21 13:16 ` Jarkko Sakkinen
2024-05-22 8:18 ` Vitor Soares
2024-05-22 12:01 ` Jarkko Sakkinen
2024-05-22 13:17 ` Vitor Soares
2024-05-22 13:31 ` Vitor Soares
2024-05-22 14:11 ` Jarkko Sakkinen
2024-05-22 14:20 ` James Bottomley
2024-05-22 14:39 ` Jarkko Sakkinen
2024-05-22 13:35 ` James Bottomley
2024-05-22 14:13 ` Jarkko Sakkinen
2024-05-22 14:58 ` Vitor Soares
2024-05-22 16:11 ` Jarkko Sakkinen
2024-05-23 7:59 ` Vitor Soares
2024-05-27 14:51 ` Jarkko Sakkinen
2024-05-27 15:01 ` Jarkko Sakkinen
2024-05-27 15:12 ` Jarkko Sakkinen
2024-05-27 15:34 ` Jarkko Sakkinen
2024-05-27 17:57 ` James Bottomley
2024-05-27 19:53 ` Jarkko Sakkinen
2024-05-27 20:01 ` Jarkko Sakkinen
2024-05-27 21:36 ` James Bottomley
2024-05-27 23:17 ` Jarkko Sakkinen
2024-05-27 23:44 ` James Bottomley
2024-05-28 1:04 ` Jarkko Sakkinen
2024-05-28 1:07 ` Jarkko Sakkinen
2024-05-19 23:51 ` [PATCH 2/3] KEYS: trusted: Fix memory leak in tpm2_key_encode() Jarkko Sakkinen
2024-05-19 23:51 ` Jarkko Sakkinen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240519235122.3380-4-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.com \
--cc=stable@vger.kernel.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).