diff for duplicates of <1544660301.3956.3.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 34c03ca..0eaf4b6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,15 +21,9 @@ Mimi > status = INTEGRITY_UNKNOWN; > break; > } -> - if (rc && func == KEXEC_KERNEL_CHECK) +> - if (rc && func = KEXEC_KERNEL_CHECK) > + if (IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING) && rc && -> + func == KEXEC_KERNEL_CHECK) +> + func = KEXEC_KERNEL_CHECK) > rc = integrity_digsig_verify(INTEGRITY_KEYRING_PLATFORM, > (const char *)xattr_value, > xattr_len, - - -_______________________________________________ -kexec mailing list -kexec@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/kexec diff --git a/a/content_digest b/N1/content_digest index fa5464d..bc79ebd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,21 +3,21 @@ "ref\08736r2fw88.fsf@morokweng.localdomain\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v2 7/7] ima: Support platform keyring for kernel appraisal\0" - "Date\0Wed, 12 Dec 2018 19:18:21 -0500\0" + "Date\0Thu, 13 Dec 2018 00:18:21 +0000\0" "To\0Thiago Jung Bauermann <bauerman@linux.ibm.com>" " Nayna Jain <nayna@linux.ibm.com>\0" - "Cc\0linux-efi@vger.kernel.org" - mpe@ellerman.id.au - kexec@lists.infradead.org + "Cc\0linux-integrity@vger.kernel.org" + linux-security-module@vger.kernel.org + linux-efi@vger.kernel.org linux-kernel@vger.kernel.org dhowells@redhat.com + jforbes@redhat.com seth.forshee@canonical.com - linux-security-module@vger.kernel.org + kexec@lists.infradead.org keyrings@vger.kernel.org + vgoyal@redhat.com ebiederm@xmission.com - jforbes@redhat.com - linux-integrity@vger.kernel.org - " vgoyal@redhat.com\0" + " mpe@ellerman.id.au\0" "\00:1\0" "b\0" "On Wed, 2018-12-12 at 16:14 -0200, Thiago Jung Bauermann wrote:\n" @@ -43,17 +43,11 @@ "> \t\t\tstatus = INTEGRITY_UNKNOWN;\n" "> \t\t\tbreak;\n" "> \t\t}\n" - "> -\t\tif (rc && func == KEXEC_KERNEL_CHECK)\n" + "> -\t\tif (rc && func = KEXEC_KERNEL_CHECK)\n" "> +\t\tif (IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING) && rc &&\n" - "> +\t\t func == KEXEC_KERNEL_CHECK)\n" + "> +\t\t func = KEXEC_KERNEL_CHECK)\n" "> \t\t\trc = integrity_digsig_verify(INTEGRITY_KEYRING_PLATFORM,\n" "> \t\t\t\t\t\t (const char *)xattr_value,\n" - "> \t\t\t\t\t\t xattr_len,\n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + "> \t\t\t\t\t\t xattr_len," -84bf3ea3b3e55f8137c330986f9c7b7770d9449bdfe686fa5fd8b3860eed34cc +a6b98c14d9eaf14e83c73ca531dd6286391d9c455237cd6e056ef24918cb5367
diff --git a/a/1.txt b/N2/1.txt index 34c03ca..9efacdd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,9 +27,3 @@ Mimi > rc = integrity_digsig_verify(INTEGRITY_KEYRING_PLATFORM, > (const char *)xattr_value, > xattr_len, - - -_______________________________________________ -kexec mailing list -kexec@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/kexec diff --git a/a/content_digest b/N2/content_digest index fa5464d..58e18a3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,18 +6,18 @@ "Date\0Wed, 12 Dec 2018 19:18:21 -0500\0" "To\0Thiago Jung Bauermann <bauerman@linux.ibm.com>" " Nayna Jain <nayna@linux.ibm.com>\0" - "Cc\0linux-efi@vger.kernel.org" - mpe@ellerman.id.au - kexec@lists.infradead.org + "Cc\0linux-integrity@vger.kernel.org" + linux-security-module@vger.kernel.org + linux-efi@vger.kernel.org linux-kernel@vger.kernel.org dhowells@redhat.com + jforbes@redhat.com seth.forshee@canonical.com - linux-security-module@vger.kernel.org + kexec@lists.infradead.org keyrings@vger.kernel.org + vgoyal@redhat.com ebiederm@xmission.com - jforbes@redhat.com - linux-integrity@vger.kernel.org - " vgoyal@redhat.com\0" + " mpe@ellerman.id.au\0" "\00:1\0" "b\0" "On Wed, 2018-12-12 at 16:14 -0200, Thiago Jung Bauermann wrote:\n" @@ -48,12 +48,6 @@ "> +\t\t func == KEXEC_KERNEL_CHECK)\n" "> \t\t\trc = integrity_digsig_verify(INTEGRITY_KEYRING_PLATFORM,\n" "> \t\t\t\t\t\t (const char *)xattr_value,\n" - "> \t\t\t\t\t\t xattr_len,\n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + "> \t\t\t\t\t\t xattr_len," -84bf3ea3b3e55f8137c330986f9c7b7770d9449bdfe686fa5fd8b3860eed34cc +00ca80472ee8f61758cc213a95484e8845bec0876fbdf40f62a07737ca953c01
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.