From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: linux-security-module <linux-security-module@vger.kernel.org>
Cc: Andreas Steffen <andreas.steffen@strongswan.org>,
linux-ima-devel@lists.sourceforge.net,
Dave Young <dyoung@redhat.com>,
kexec@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org,
Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mimi Zohar <zohar@linux.vnet.ibm.com>
Subject: [PATCH v3 9/9] ima: platform-independent hash value
Date: Tue, 6 Sep 2016 10:03:04 -0400 [thread overview]
Message-ID: <1473170584-15094-10-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1473170584-15094-1-git-send-email-zohar@linux.vnet.ibm.com>
From: Andreas Steffen <andreas.steffen@strongswan.org>
For remote attestion it is important for the ima measurement values
to be platform-independent. Therefore integer fields to be hashed
must be converted to canonical format.
Changelog:
- Define canonical format as little endian (Mimi)
Signed-off-by: Andreas Steffen <andreas.steffen@strongswan.org>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
---
security/integrity/ima/ima_crypto.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
index 38f2ed8..802d5d2 100644
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
@@ -477,11 +477,13 @@ static int ima_calc_field_array_hash_tfm(struct ima_field_data *field_data,
u8 buffer[IMA_EVENT_NAME_LEN_MAX + 1] = { 0 };
u8 *data_to_hash = field_data[i].data;
u32 datalen = field_data[i].len;
+ u32 datalen_to_hash =
+ !ima_canonical_fmt ? datalen : cpu_to_le32(datalen);
if (strcmp(td->name, IMA_TEMPLATE_IMA_NAME) != 0) {
rc = crypto_shash_update(shash,
- (const u8 *) &field_data[i].len,
- sizeof(field_data[i].len));
+ (const u8 *) &datalen_to_hash,
+ sizeof(datalen_to_hash));
if (rc)
break;
} else if (strcmp(td->fields[i]->field_id, "n") == 0) {
--
2.1.0
prev parent reply other threads:[~2016-09-06 14:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 14:02 [PATCH v3 0/9] ima: carry the measurement list across kexec Mimi Zohar
2016-09-06 14:02 ` [PATCH v3 1/9] ima: on soft reboot, restore the measurement list Mimi Zohar
2016-09-06 14:02 ` [PATCH v3 2/9] ima: permit duplicate measurement list entries Mimi Zohar
2016-09-06 14:02 ` [PATCH v3 3/9] ima: maintain memory size needed for serializing the measurement list Mimi Zohar
2016-09-06 14:02 ` [PATCH v3 4/9] ima: serialize the binary_runtime_measurements Mimi Zohar
2016-09-06 14:03 ` [PATCH v3 5/9] ima: on soft reboot, save the measurement list Mimi Zohar
2016-09-06 14:03 ` [PATCH v3 6/9] ima: store the builtin/custom template definitions in a list Mimi Zohar
2016-09-06 14:03 ` [PATCH v3 7/9] ima: support restoring multiple template formats Mimi Zohar
2016-09-06 14:03 ` [PATCH v3 8/9] ima: define a canonical binary_runtime_measurements list format Mimi Zohar
2016-09-06 14:03 ` Mimi Zohar [this message]
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=1473170584-15094-10-git-send-email-zohar@linux.vnet.ibm.com \
--to=zohar@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=andreas.steffen@strongswan.org \
--cc=bauerman@linux.vnet.ibm.com \
--cc=dyoung@redhat.com \
--cc=kexec@lists.infradead.org \
--cc=linux-ima-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/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).