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,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>
Subject: [PATCHC v7 10/10] ima: platform-independent hash value
Date: Thu, 10 Nov 2016 09:56:20 -0500 [thread overview]
Message-ID: <1478789780-17719-11-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1478789780-17719-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 38f2ed830dd6..802d5d20f36f 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
next prev parent reply other threads:[~2016-11-10 14:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-10 14:56 [PATCHC v7 00/10] ima: carry the measurement list across kexec Mimi Zohar
2016-11-10 14:56 ` [PATCHC v7 01/10] powerpc: ima: Get the kexec buffer passed by the previous kernel Mimi Zohar
2016-11-10 14:56 ` [PATCHC v7 02/10] ima: on soft reboot, restore the measurement list Mimi Zohar
2016-11-16 17:36 ` Dmitry Kasatkin
2016-11-10 14:56 ` [PATCHC v7 03/10] ima: permit duplicate measurement list entries Mimi Zohar
2016-11-10 14:56 ` [PATCHC v7 04/10] ima: maintain memory size needed for serializing the measurement list Mimi Zohar
2016-11-10 14:56 ` [PATCHC v7 05/10] powerpc: ima: Send the kexec buffer to the next kernel Mimi Zohar
2016-11-10 14:56 ` [PATCHC v7 06/10] ima: on soft reboot, save the measurement list Mimi Zohar
2016-11-10 14:56 ` [PATCHC v7 07/10] ima: store the builtin/custom template definitions in a list Mimi Zohar
2016-11-10 14:56 ` [PATCHC v7 08/10] ima: support restoring multiple template formats Mimi Zohar
2016-11-10 14:56 ` [PATCHC v7 09/10] ima: define a canonical binary_runtime_measurements list format Mimi Zohar
2016-11-10 14:56 ` Mimi Zohar [this message]
2016-11-16 17:38 ` [PATCHC v7 00/10] ima: carry the measurement list across kexec Dmitry Kasatkin
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=1478789780-17719-11-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=dmitry.kasatkin@gmail.com \
--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).