From: bsz@semihalf.com
To: linux-efi@vger.kernel.org, linux-integrity@vger.kernel.org,
linux-kernel@vger.kernel.org, peterhuewe@gmx.de,
jarkko.sakkinen@linux.intel.com, ard.biesheuvel@linaro.org
Cc: tweek@google.com, mingo@kernel.org, hdegoede@redhat.com,
leif.lindholm@linaro.org, mw@semihalf.com,
Bartosz Szczepanek <bsz@semihalf.com>
Subject: [PATCH 2/5] tpm: Change calc_tpm2_event_size signature
Date: Mon, 11 Feb 2019 15:30:49 +0100 [thread overview]
Message-ID: <20190211143052.3128-3-bsz@semihalf.com> (raw)
In-Reply-To: <20190211143052.3128-1-bsz@semihalf.com>
From: Bartosz Szczepanek <bsz@semihalf.com>
Pass tcg_efi_specid_event as an argument instead of tcg_pcr_event, as the
former is what is actually needed to compute event size. tcg_pcr_event
structure describes TPM event log header (even though its name), from where
efispecid can be extracted -- it seems cleaner and less misleading to do it
out of calc_tpm2_event_size function.
Also, use ssize_t instead of int for event log size.
Signed-off-by: Bartosz Szczepanek <bsz@semihalf.com>
---
lib/tpm.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/lib/tpm.c b/lib/tpm.c
index aaeeafe52426..263ccfdaefa5 100644
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -15,6 +15,7 @@
#include <linux/export.h>
#include <linux/string.h>
#include <linux/tpm_eventlog.h>
+#include <linux/errno.h>
/*
* calc_tpm2_event_size() - calculate the event size, where event
@@ -23,19 +24,18 @@
* Family "2.0".
* @event: event whose size is to be calculated.
- * @event_header: the first event in the event log.
+ * @efispecid: pointer to structure describing algorithms used.
*
- * Returns size of the event. If it is an invalid event, returns 0.
+ * Returns size of the event. If it is an invalid event, returns -EINVAL.
*/
-int calc_tpm2_event_size(struct tcg_pcr_event2 *event,
- struct tcg_pcr_event *event_header)
+ssize_t calc_tpm2_event_size(struct tcg_pcr_event2 *event,
+ struct tcg_efi_specid_event *efispecid)
{
- struct tcg_efi_specid_event *efispecid;
struct tcg_event_field *event_field;
void *marker;
void *marker_start;
u32 halg_size;
- size_t size;
+ ssize_t size;
u16 halg;
int i;
int j;
@@ -45,11 +45,9 @@ int calc_tpm2_event_size(struct tcg_pcr_event2 *event,
marker = marker + sizeof(event->pcr_idx) + sizeof(event->event_type)
+ sizeof(event->count);
- efispecid = (struct tcg_efi_specid_event *)event_header->event;
-
/* Check if event is malformed. */
if (event->count > efispecid->num_algs)
- return 0;
+ return -EINVAL;
for (i = 0; i < event->count; i++) {
halg_size = sizeof(event->digests[i].alg_id);
@@ -64,7 +62,7 @@ int calc_tpm2_event_size(struct tcg_pcr_event2 *event,
}
/* Algorithm without known length. Such event is unparseable. */
if (j == efispecid->num_algs)
- return 0;
+ return -EINVAL;
}
event_field = (struct tcg_event_field *)marker;
@@ -73,7 +71,7 @@ int calc_tpm2_event_size(struct tcg_pcr_event2 *event,
size = marker - marker_start;
if ((event->event_type == 0) && (event_field->event_size == 0))
- return 0;
+ return -EINVAL;
return size;
}
--
2.14.4
next prev parent reply other threads:[~2019-02-11 16:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 14:30 [PATCH 0/5] Add support for TPM event log 2.0 on EFI/ARM bsz
2019-02-11 14:30 ` [PATCH 1/5] tpm: Copy calc_tpm2_event_size() to TPM library bsz
2019-02-13 11:14 ` Jarkko Sakkinen
2019-02-13 11:18 ` Jarkko Sakkinen
2019-02-11 14:30 ` bsz [this message]
2019-02-13 11:20 ` [PATCH 2/5] tpm: Change calc_tpm2_event_size signature Jarkko Sakkinen
2019-02-11 14:30 ` [PATCH 3/5] tpm: Use library version of calc_tpm2_event_size in sysfs code bsz
2019-02-13 11:22 ` Jarkko Sakkinen
2019-02-11 14:30 ` [PATCH 4/5] efi/libstub/tpm: Retrieve TPM event log in 2.0 format bsz
2019-02-13 11:26 ` Jarkko Sakkinen
2019-02-13 14:21 ` Bartosz Szczepanek
2019-02-13 14:22 ` Ard Biesheuvel
2019-02-11 14:30 ` [PATCH 5/5] efi/arm: Retrieve TPM event log at efi_entry bsz
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=20190211143052.3128-3-bsz@semihalf.com \
--to=bsz@semihalf.com \
--cc=ard.biesheuvel@linaro.org \
--cc=hdegoede@redhat.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=leif.lindholm@linaro.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mw@semihalf.com \
--cc=peterhuewe@gmx.de \
--cc=tweek@google.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).