From: Jarkko Sakkinen <jarkko@kernel.org>
To: tpm-protocol@lists.linux.dev
Cc: tpm2@lists.linux.dev, Jarkko Sakkinen <jarkko@kernel.org>
Subject: [PATCH] fix(builder): add missing rc.is_warning() check
Date: Mon, 1 Sep 2025 20:04:27 +0300 [thread overview]
Message-ID: <20250901170427.2194100-1-jarkko@kernel.org> (raw)
The new tests `test_response_build_warning*` confirm a failure in the
response builder. More precisely, `*with_sessions` variation fails.
The bug emits from a missing `is_warning` check in the response,
leading to an incorrectly constructed response.
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
src/message/build.rs | 2 +-
tests/runner.rs | 66 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+), 1 deletion(-)
diff --git a/src/message/build.rs b/src/message/build.rs
index 9b72f43..4a48228 100644
--- a/src/message/build.rs
+++ b/src/message/build.rs
@@ -98,7 +98,7 @@ where
TpmSt::NoSessions
};
- if rc.is_error() {
+ if rc.is_error() || rc.is_warning() {
(TpmSt::NoSessions as u16).build(writer)?;
u32::try_from(TPM_HEADER_SIZE)?.build(writer)?;
rc.value().build(writer)?;
diff --git a/tests/runner.rs b/tests/runner.rs
index 45140e7..c07bc84 100644
--- a/tests/runner.rs
+++ b/tests/runner.rs
@@ -721,6 +721,70 @@ fn test_response_build_error() {
);
}
+fn test_response_build_warning() {
+ let resp = TpmFlushContextResponse::default();
+ let rc = TpmRc::try_from(TpmRcBase::ContextGap as u32).unwrap();
+
+ let generated_bytes = {
+ let mut buf = [0u8; TPM_MAX_COMMAND_SIZE];
+ let len = {
+ let mut writer = TpmWriter::new(&mut buf);
+ tpm_build_response(&resp, &[], rc, &mut writer).unwrap();
+ writer.len()
+ };
+ buf[..len].to_vec()
+ };
+
+ assert_eq!(
+ generated_bytes.len(),
+ 10,
+ "A warning response should only be 10 bytes long."
+ );
+
+ let (tag, _) = u16::parse(&generated_bytes).unwrap();
+ assert_eq!(
+ tag,
+ TpmSt::NoSessions as u16,
+ "A warning response must have a NO_SESSIONS tag."
+ );
+}
+
+fn test_response_build_warning_with_sessions() {
+ let resp = TpmStartAuthSessionResponse::default();
+ let rc = TpmRc::try_from(TpmRcBase::ContextGap as u32).unwrap();
+ let mut sessions = TpmAuthResponses::new();
+ sessions
+ .try_push(TpmsAuthResponse {
+ nonce: Tpm2bNonce::default(),
+ session_attributes: TpmaSession::default(),
+ hmac: Tpm2bAuth::default(),
+ })
+ .unwrap();
+
+ let generated_bytes = {
+ let mut buf = [0u8; TPM_MAX_COMMAND_SIZE];
+ let len = {
+ let mut writer = TpmWriter::new(&mut buf);
+ tpm_build_response(&resp, &sessions, rc, &mut writer).unwrap();
+ writer.len()
+ };
+ buf[..len].to_vec()
+ };
+
+ assert_eq!(
+ generated_bytes.len(),
+ 10,
+ "A warning response with sessions should only be 10 bytes long."
+ );
+
+ let (tag, _) = u16::parse(&generated_bytes).unwrap();
+ assert_eq!(
+ tag,
+ TpmSt::NoSessions as u16,
+ "A warning response with sessions must have a NO_SESSIONS tag."
+ );
+}
+
fn test_response_build_pcr_read() {
let mut pcr_values = TpmlDigest::new();
pcr_values
@@ -1085,6 +1149,8 @@ test_suite!(
test_macro_response_parse_correctness,
test_macro_response_parse_remainder,
test_response_build_error,
+ test_response_build_warning,
+ test_response_build_warning_with_sessions,
test_response_build_pcr_read,
test_response_parse_pcr_event,
test_response_parse_policy_get_digest,
--
2.39.5
reply other threads:[~2025-09-01 17:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20250901170427.2194100-1-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=tpm-protocol@lists.linux.dev \
--cc=tpm2@lists.linux.dev \
/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