From 0ebe80466fcbe7605db5d413f4370f2ccddf672b Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Mon, 30 May 2022 10:47:12 -0400 Subject: [PATCH] swtpm: Refactor existing function to use new tpmlib_get_cmd_ordinal() Signed-off-by: Stefan Berger --- src/swtpm/tpmlib.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/swtpm/tpmlib.c b/src/swtpm/tpmlib.c index e8632f2..b1119bd 100644 --- a/src/swtpm/tpmlib.c +++ b/src/swtpm/tpmlib.c @@ -169,15 +169,12 @@ uint32_t tpmlib_get_cmd_ordinal(const unsigned char *request, size_t req_len) bool tpmlib_is_request_cancelable(TPMLIB_TPMVersion tpmversion, const unsigned char *request, size_t req_len) { - struct tpm_req_header *hdr; - uint32_t ordinal; - if (req_len < sizeof(struct tpm_req_header)) + uint32_t ordinal = tpmlib_get_cmd_ordinal(request, req_len); + + if (ordinal == TPM_ORDINAL_NONE) return false; - hdr = (struct tpm_req_header *)request; - ordinal = be32toh(hdr->ordinal); - if (tpmversion == TPMLIB_TPM_VERSION_2) return (ordinal == TPMLIB_TPM2_CC_CreatePrimary || ordinal == TPMLIB_TPM2_CC_Create);