From: Nayna Jain <nayna@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: linux-security-module@vger.kernel.org, linux-efi@vger.kernel.org,
linux-kernel@vger.kernel.org, zohar@linux.ibm.com,
dhowells@redhat.com, jforbes@redhat.com,
seth.forshee@canonical.com, kexec@lists.infradead.org,
keyrings@vger.kernel.org, vgoyal@redhat.com,
ebiederm@xmission.com, mpe@ellerman.id.au,
Nayna Jain <nayna@linux.ibm.com>
Subject: [PATCH v2 7/7] ima: Support platform keyring for kernel appraisal
Date: Sun, 9 Dec 2018 01:57:05 +0530 [thread overview]
Message-ID: <20181208202705.18673-8-nayna@linux.ibm.com> (raw)
In-Reply-To: <20181208202705.18673-1-nayna@linux.ibm.com>
On secure boot enabled systems, the bootloader verifies the kernel
image and possibly the initramfs signatures based on a set of keys. A
soft reboot(kexec) of the system, with the same kernel image and
initramfs, requires access to the original keys to verify the
signatures.
This patch allows IMA-appraisal access to those original keys, now
loaded on the platform keyring, needed for verifying the kernel image
and initramfs signatures.
Signed-off-by: Nayna Jain <nayna@linux.ibm.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
- replace 'rc' with 'xattr_len' when calling integrity_digsig_verify()
with INTEGRITY_KEYRING_IMA for readability
Suggested-by: Serge Hallyn <serge@hallyn.com>
---
Changelog:
v2:
- replace 'rc' with 'xattr_len' when calling integrity_digsig_verify()
with INTEGRITY_KEYRING_IMA for readability
security/integrity/ima/ima_appraise.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
index deec1804a00a..e8f520450895 100644
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -289,12 +289,21 @@ int ima_appraise_measurement(enum ima_hooks func,
case EVM_IMA_XATTR_DIGSIG:
set_bit(IMA_DIGSIG, &iint->atomic_flags);
rc = integrity_digsig_verify(INTEGRITY_KEYRING_IMA,
- (const char *)xattr_value, rc,
+ (const char *)xattr_value,
+ xattr_len,
iint->ima_hash->digest,
iint->ima_hash->length);
if (rc == -EOPNOTSUPP) {
status = INTEGRITY_UNKNOWN;
- } else if (rc) {
+ break;
+ }
+ if (rc && func == KEXEC_KERNEL_CHECK)
+ rc = integrity_digsig_verify(INTEGRITY_KEYRING_PLATFORM,
+ (const char *)xattr_value,
+ xattr_len,
+ iint->ima_hash->digest,
+ iint->ima_hash->length);
+ if (rc) {
cause = "invalid-signature";
status = INTEGRITY_FAIL;
} else {
--
2.13.6
next prev parent reply other threads:[~2018-12-08 20:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-08 20:26 [PATCH v2 0/7] add platform/firmware keys support for kernel verification by IMA Nayna Jain
2018-12-08 20:26 ` [PATCH v2 1/7] integrity: Define a trusted platform keyring Nayna Jain
2018-12-09 4:48 ` Nayna Jain
2018-12-13 0:15 ` Thiago Jung Bauermann
2018-12-11 18:27 ` James Morris
2018-12-08 20:27 ` [PATCH v2 2/7] integrity: Load certs to the " Nayna Jain
2018-12-11 18:30 ` James Morris
2018-12-13 0:17 ` Thiago Jung Bauermann
2018-12-08 20:27 ` [PATCH v2 3/7] efi: Add EFI signature data types Nayna Jain
2018-12-11 18:30 ` James Morris
2018-12-08 20:27 ` [PATCH v2 4/7] efi: Add an EFI signature blob parser Nayna Jain
2018-12-08 20:27 ` [PATCH v2 5/7] efi: Import certificates from UEFI Secure Boot Nayna Jain
2018-12-11 18:47 ` James Morris
2018-12-12 17:31 ` Nayna Jain
2018-12-12 21:32 ` [PATCH v2a " Nayna Jain
2018-12-08 20:27 ` [PATCH v2 6/7] efi: Allow the "db" UEFI variable to be suppressed Nayna Jain
2018-12-11 18:49 ` James Morris
2018-12-08 20:27 ` Nayna Jain [this message]
2018-12-11 18:53 ` [PATCH v2 7/7] ima: Support platform keyring for kernel appraisal James Morris
2018-12-12 18:14 ` Thiago Jung Bauermann
2018-12-13 0:18 ` Mimi Zohar
2018-12-13 0:19 ` Thiago Jung Bauermann
2018-12-09 18:39 ` [PATCH v2 0/7] add platform/firmware keys support for kernel verification by IMA 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=20181208202705.18673-8-nayna@linux.ibm.com \
--to=nayna@linux.ibm.com \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=jforbes@redhat.com \
--cc=kexec@lists.infradead.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mpe@ellerman.id.au \
--cc=seth.forshee@canonical.com \
--cc=vgoyal@redhat.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).