From: Mimi Zohar <zohar@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.ibm.com>, Petr Vorel <pvorel@suse.cz>,
Bruno Meneguele <bmeneg@redhat.com>
Subject: [PATCH 1/3] ima-evm-utils: improve reading TPM 1.2 PCRs
Date: Thu, 9 Jul 2020 10:36:34 -0400 [thread overview]
Message-ID: <1594305396-21280-2-git-send-email-zohar@linux.ibm.com> (raw)
In-Reply-To: <1594305396-21280-1-git-send-email-zohar@linux.ibm.com>
Instead of reading the TPM 1.2 PCRs one at a time, opening and closing
the securityfs file each time, read all of PCRs at once.
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
---
src/evmctl.c | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/src/evmctl.c b/src/evmctl.c
index 21809b3229e9..0e489e2c7ba6 100644
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -152,6 +152,14 @@ static void print_usage(struct command *cmd);
static const char *xattr_ima = "security.ima";
static const char *xattr_evm = "security.evm";
+struct tpm_bank_info {
+ int digest_size;
+ int supported;
+ const char *algo_name;
+ uint8_t digest[MAX_DIGEST_SIZE];
+ uint8_t pcr[NUM_PCRS][MAX_DIGEST_SIZE];
+};
+
static int bin2file(const char *file, const char *ext, const unsigned char *data, int len)
{
FILE *fp;
@@ -1366,13 +1374,13 @@ static int cmd_ima_clear(struct command *cmd)
static char *pcrs = "/sys/class/tpm/tpm0/device/pcrs"; /* Kernels >= 4.0 */
static char *misc_pcrs = "/sys/class/misc/tpm0/device/pcrs";
-static int tpm_pcr_read(int idx, uint8_t *pcr, int len)
+/* Read all of the TPM 1.2 PCRs */
+static int tpm_pcr_read(struct tpm_bank_info *tpm_banks, int len)
{
FILE *fp;
char *p, pcr_str[7], buf[70]; /* length of the TPM string */
int result = -1;
-
- sprintf(pcr_str, "PCR-%2.2d", idx);
+ int i = 0;
fp = fopen(pcrs, "r");
if (!fp)
@@ -1385,11 +1393,10 @@ static int tpm_pcr_read(int idx, uint8_t *pcr, int len)
p = fgets(buf, sizeof(buf), fp);
if (!p)
break;
- if (!strncmp(p, pcr_str, 6)) {
- hex2bin(pcr, p + 7, len);
- result = 0;
- break;
- }
+ sprintf(pcr_str, "PCR-%2.2d", i);
+ if (!strncmp(p, pcr_str, 6))
+ hex2bin(tpm_banks[0].pcr[i++], p + 7, len);
+ result = 0;
}
fclose(fp);
return result;
@@ -1571,14 +1578,6 @@ void ima_ng_show(struct template_entry *entry)
}
}
-struct tpm_bank_info {
- int digest_size;
- int supported;
- const char *algo_name;
- uint8_t digest[MAX_DIGEST_SIZE];
- uint8_t pcr[NUM_PCRS][MAX_DIGEST_SIZE];
-};
-
static void set_bank_info(struct tpm_bank_info *bank, const char *algo_name)
{
const EVP_MD *md;
@@ -1771,11 +1770,9 @@ static int read_tpm_pcrs(int num_banks, struct tpm_bank_info *tpm_banks)
{
int i;
- for (i = 0; i < NUM_PCRS; i++) {
- if (tpm_pcr_read(i, tpm_banks[0].pcr[i], SHA_DIGEST_LENGTH)) {
- log_debug("Failed to read TPM 1.2 PCRs.\n");
- return -1;
- }
+ if (tpm_pcr_read(tpm_banks, SHA_DIGEST_LENGTH)) {
+ log_debug("Failed to read TPM 1.2 PCRs.\n");
+ return -1;
}
tpm_banks[0].supported = 1;
--
2.7.5
next prev parent reply other threads:[~2020-07-09 14:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 14:36 [PATCH 0/3] additional "ima-measurement" support Mimi Zohar
2020-07-09 14:36 ` Mimi Zohar [this message]
2020-07-09 14:36 ` [PATCH 2/3] ima_evm_utils: support extending TPM 2.0 banks w/original SHA1 padded digest Mimi Zohar
2020-07-09 14:36 ` [PATCH 3/3] ima-evm-utils: support providing the TPM 1.2 PCRs as a file Mimi Zohar
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=1594305396-21280-2-git-send-email-zohar@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=bmeneg@redhat.com \
--cc=linux-integrity@vger.kernel.org \
--cc=pvorel@suse.cz \
/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).