From: Roberto Sassu <roberto.sassu@huawei.com>
To: Maurizio Drocco <maurizio.drocco@ibm.com>,
"zohar@linux.ibm.com" <zohar@linux.ibm.com>
Cc: "dmitry.kasatkin@gmail.com" <dmitry.kasatkin@gmail.com>,
"jejb@linux.ibm.com" <jejb@linux.ibm.com>,
"jmorris@namei.org" <jmorris@namei.org>,
"linux-integrity@vger.kernel.org"
<linux-integrity@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-security-module@vger.kernel.org"
<linux-security-module@vger.kernel.org>,
"serge@hallyn.com" <serge@hallyn.com>,
Silviu Vlasceanu <Silviu.Vlasceanu@huawei.com>
Subject: RE: [PATCH] extend IMA boot_aggregate with kernel measurements
Date: Fri, 12 Jun 2020 15:11:53 +0000 [thread overview]
Message-ID: <380af929b2d2440a9dc35ba0b374247d@huawei.com> (raw)
In-Reply-To: <20200612143812.1609-1-maurizio.drocco@ibm.com>
[-- Attachment #1: Type: text/plain, Size: 3082 bytes --]
> From: linux-integrity-owner@vger.kernel.org [mailto:linux-integrity-
> owner@vger.kernel.org] On Behalf Of Maurizio Drocco
> Sent: Friday, June 12, 2020 4:38 PM
> IMA is not considering TPM registers 8-9 when calculating the boot
> aggregate. When registers 8-9 are used to store measurements of the
> kernel and its command line (e.g., grub2 bootloader with tpm module
> enabled), IMA should include them in the boot aggregate.
>
> Signed-off-by: Maurizio Drocco <maurizio.drocco@ibm.com>
> ---
> security/integrity/ima/ima.h | 2 +-
> security/integrity/ima/ima_crypto.c | 15 ++++++++++++++-
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
> index df93ac258e01..9d94080bdad8 100644
> --- a/security/integrity/ima/ima.h
> +++ b/security/integrity/ima/ima.h
> @@ -30,7 +30,7 @@
>
> enum ima_show_type { IMA_SHOW_BINARY,
> IMA_SHOW_BINARY_NO_FIELD_LEN,
> IMA_SHOW_BINARY_OLD_STRING_FMT,
> IMA_SHOW_ASCII };
> -enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
> +enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8, TPM_PCR10 = 10 };
>
> /* digest size for IMA, fits SHA1 or MD5 */
> #define IMA_DIGEST_SIZE SHA1_DIGEST_SIZE
> diff --git a/security/integrity/ima/ima_crypto.c
> b/security/integrity/ima/ima_crypto.c
> index 220b14920c37..64f5e3151e18 100644
> --- a/security/integrity/ima/ima_crypto.c
> +++ b/security/integrity/ima/ima_crypto.c
> @@ -809,7 +809,7 @@ static void ima_pcrread(u32 idx, struct tpm_digest *d)
> static int ima_calc_boot_aggregate_tfm(char *digest, u16 alg_id,
> struct crypto_shash *tfm)
> {
> - struct tpm_digest d = { .alg_id = alg_id, .digest = {0} };
> + struct tpm_digest d = { .alg_id = alg_id, .digest = {0} }, d0 = d;
> int rc;
> u32 i;
> SHASH_DESC_ON_STACK(shash, tfm);
> @@ -830,6 +830,19 @@ static int ima_calc_boot_aggregate_tfm(char
> *digest, u16 alg_id,
> rc = crypto_shash_update(shash, d.digest,
> crypto_shash_digestsize(tfm));
> }
> + /*
> + * extend cumulative sha1 over tpm registers 8-9, which contain
Hi Maurizio
with recent patches, boot_aggregate can be calculated from non-SHA1
PCR banks. I would replace with:
Extend cumulative digest over ...
Given that with this patch boot_aggregate is calculated differently,
shouldn't we call it boot_aggregate_v2 and enable it with a new
option?
Thanks
Roberto
HUAWEI TECHNOLOGIES Duesseldorf GmbH, HRB 56063
Managing Director: Li Peng, Li Jian, Shi Yanli
> + * measurement for the kernel command line (reg. 8) and image
> (reg. 9)
> + * in a typical PCR allocation.
> + */
> + for (i = TPM_PCR8; i < TPM_PCR10; i++) {
> + ima_pcrread(i, &d);
> + /* if not zero, accumulate with current aggregate */
> + if (memcmp(d.digest, d0.digest,
> + crypto_shash_digestsize(tfm)) != 0)
> + rc = crypto_shash_update(shash, d.digest,
> +
> crypto_shash_digestsize(tfm));
> + }
> if (!rc)
> crypto_shash_final(shash, digest);
> return rc;
> --
> 2.17.1
[-- Attachment #2: Type: message/rfc822, Size: 2632 bytes --]
From: pmail_patchwork <patchwork@huawei.com>
To: Roberto Sassu <roberto.sassu@huawei.com>
Cc: pmail_hulkcommits <hulkcommits@huawei.com>, pmail_hulkcommits <hulkcommits@huawei.com>
Subject: re: [PATCH 9/9] ima: Don't remove security.ima if file must not be appraised
Date: Thu, 28 May 2020 08:03:43 +0000
Message-ID: <20200528080343.54677.49365@hulknmm>
Total: 0 warnings, 0 errors, 3 items checked
All 3 test items SUCCESS.
Link: http://patchwork.huawei.com/patch/52890/
---
Hulk Robot
next prev parent reply other threads:[~2020-06-12 15:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 19:54 [PATCH] extend IMA boot_aggregate with kernel measurements Maurizio Drocco
2020-06-12 0:29 ` Mimi Zohar
2020-06-12 14:38 ` Maurizio Drocco
2020-06-12 15:11 ` Roberto Sassu [this message]
2020-06-12 17:14 ` James Bottomley
2020-06-16 17:29 ` Roberto Sassu
2020-06-16 18:11 ` Mimi Zohar
2020-06-18 12:38 ` Roberto Sassu
2020-06-18 20:11 ` Maurizio Drocco
2020-06-18 20:11 ` [PATCH] ima_evm_utils: extended calc_bootaggr to PCRs 8 - 9 Maurizio Drocco
2020-06-22 20:14 ` Mimi Zohar
2020-06-22 4:50 ` [PATCH] ima: extend boot_aggregate with kernel measurements Maurizio Drocco
2020-06-23 14:03 ` Mimi Zohar
2020-06-23 15:57 ` [PATCH v4] " Maurizio Drocco
2020-06-23 18:53 ` Bruno Meneguele
2020-06-23 18:01 ` [PATCH v2] ima_evm_utils: extended calc_bootaggr to PCRs 8 - 9 Maurizio Drocco
2020-06-23 18:13 ` Bruno Meneguele
2020-06-24 21:17 ` Stefan Berger
2020-06-24 21:33 ` [PATCH] " Maurizio Drocco
2020-06-24 21:33 ` [PATCH v2] " Bruno Meneguele
2020-06-24 21:35 ` [PATCH v3] " Maurizio Drocco
2020-06-24 21:50 ` Bruno Meneguele
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=380af929b2d2440a9dc35ba0b374247d@huawei.com \
--to=roberto.sassu@huawei.com \
--cc=Silviu.Vlasceanu@huawei.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=jejb@linux.ibm.com \
--cc=jmorris@namei.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=maurizio.drocco@ibm.com \
--cc=serge@hallyn.com \
--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).