diff for duplicates of <1520615358.3911.1.camel@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 6672acd..061b26d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,15 +86,15 @@ Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > (const char *)xattr_value, rc, > iint->ima_hash->digest, > iint->ima_hash->length); -> - if (rc = -EOPNOTSUPP) { +> - if (rc == -EOPNOTSUPP) { > - status = INTEGRITY_UNKNOWN; > - } else if (rc) { > + if (rc) { -> + if (rc = -EOPNOTSUPP) { +> + if (rc == -EOPNOTSUPP) { > + status = INTEGRITY_UNKNOWN; > + break; > + } -> + if (func = KEXEC_KERNEL_CHECK) { +> + if (func == KEXEC_KERNEL_CHECK) { > + rc = integrity_digsig_verify( > + INTEGRITY_KEYRING_PLATFORM, > + (const char *)xattr_value, diff --git a/a/content_digest b/N1/content_digest index bc37e82..56262e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020180309153803.25859-3-nayna@linux.vnet.ibm.com\0" "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v2 3/3] ima: support platform keyring for kernel appraisal\0" - "Date\0Fri, 09 Mar 2018 17:09:18 +0000\0" + "Date\0Fri, 09 Mar 2018 12:09:18 -0500\0" "To\0Nayna Jain <nayna@linux.vnet.ibm.com>" " dhowells@redhat.com\0" "Cc\0keyrings@vger.kernel.org" @@ -99,15 +99,15 @@ "> \t\t\t\t\t (const char *)xattr_value, rc,\n" "> \t\t\t\t\t iint->ima_hash->digest,\n" "> \t\t\t\t\t iint->ima_hash->length);\n" - "> -\t\tif (rc = -EOPNOTSUPP) {\n" + "> -\t\tif (rc == -EOPNOTSUPP) {\n" "> -\t\t\tstatus = INTEGRITY_UNKNOWN;\n" "> -\t\t} else if (rc) {\n" "> +\t\tif (rc) {\n" - "> +\t\t\tif (rc = -EOPNOTSUPP) {\n" + "> +\t\t\tif (rc == -EOPNOTSUPP) {\n" "> +\t\t\t\tstatus = INTEGRITY_UNKNOWN;\n" "> +\t\t\t\tbreak;\n" "> +\t\t\t}\n" - "> +\t\t\tif (func = KEXEC_KERNEL_CHECK) {\n" + "> +\t\t\tif (func == KEXEC_KERNEL_CHECK) {\n" "> +\t\t\t\trc = integrity_digsig_verify(\n" "> +\t\t\t\t\t\tINTEGRITY_KEYRING_PLATFORM,\n" "> +\t\t\t\t\t\t(const char *)xattr_value,\n" @@ -183,4 +183,4 @@ "> {\n" "> \treturn 0;" -90fafe0038a76ffba9128416053b47b6f11e014a88e288e9612eec49902229cf +41a6910ff695686add2f8e62e67d25494d663f7a3295311c1aacff5216add6d7
diff --git a/a/1.txt b/N2/1.txt index 6672acd..b6dfce9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -86,15 +86,15 @@ Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > (const char *)xattr_value, rc, > iint->ima_hash->digest, > iint->ima_hash->length); -> - if (rc = -EOPNOTSUPP) { +> - if (rc == -EOPNOTSUPP) { > - status = INTEGRITY_UNKNOWN; > - } else if (rc) { > + if (rc) { -> + if (rc = -EOPNOTSUPP) { +> + if (rc == -EOPNOTSUPP) { > + status = INTEGRITY_UNKNOWN; > + break; > + } -> + if (func = KEXEC_KERNEL_CHECK) { +> + if (func == KEXEC_KERNEL_CHECK) { > + rc = integrity_digsig_verify( > + INTEGRITY_KEYRING_PLATFORM, > + (const char *)xattr_value, @@ -169,3 +169,8 @@ Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > static inline int integrity_init_keyring(const unsigned int id) > { > return 0; + +-- +To unsubscribe from this list: send the line "unsubscribe linux-security-module" in +the body of a message to majordomo at vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index bc37e82..016e3fc 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,9 @@ "ref\020180309153803.25859-1-nayna@linux.vnet.ibm.com\0" "ref\020180309153803.25859-3-nayna@linux.vnet.ibm.com\0" - "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" - "Subject\0Re: [PATCH v2 3/3] ima: support platform keyring for kernel appraisal\0" - "Date\0Fri, 09 Mar 2018 17:09:18 +0000\0" - "To\0Nayna Jain <nayna@linux.vnet.ibm.com>" - " dhowells@redhat.com\0" - "Cc\0keyrings@vger.kernel.org" - linux-security-module@vger.kernel.org - linux-kernel@vger.kernel.org - " linux-integrity@vger.kernel.org\0" + "From\0zohar@linux.vnet.ibm.com (Mimi Zohar)\0" + "Subject\0[PATCH v2 3/3] ima: support platform keyring for kernel appraisal\0" + "Date\0Fri, 09 Mar 2018 12:09:18 -0500\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 2018-03-09 at 21:08 +0530, Nayna Jain wrote:\n" @@ -99,15 +94,15 @@ "> \t\t\t\t\t (const char *)xattr_value, rc,\n" "> \t\t\t\t\t iint->ima_hash->digest,\n" "> \t\t\t\t\t iint->ima_hash->length);\n" - "> -\t\tif (rc = -EOPNOTSUPP) {\n" + "> -\t\tif (rc == -EOPNOTSUPP) {\n" "> -\t\t\tstatus = INTEGRITY_UNKNOWN;\n" "> -\t\t} else if (rc) {\n" "> +\t\tif (rc) {\n" - "> +\t\t\tif (rc = -EOPNOTSUPP) {\n" + "> +\t\t\tif (rc == -EOPNOTSUPP) {\n" "> +\t\t\t\tstatus = INTEGRITY_UNKNOWN;\n" "> +\t\t\t\tbreak;\n" "> +\t\t\t}\n" - "> +\t\t\tif (func = KEXEC_KERNEL_CHECK) {\n" + "> +\t\t\tif (func == KEXEC_KERNEL_CHECK) {\n" "> +\t\t\t\trc = integrity_digsig_verify(\n" "> +\t\t\t\t\t\tINTEGRITY_KEYRING_PLATFORM,\n" "> +\t\t\t\t\t\t(const char *)xattr_value,\n" @@ -181,6 +176,11 @@ "> +\n" "> static inline int integrity_init_keyring(const unsigned int id)\n" "> {\n" - "> \treturn 0;" + "> \treturn 0;\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" + "the body of a message to majordomo at vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -90fafe0038a76ffba9128416053b47b6f11e014a88e288e9612eec49902229cf +849379226bfc6a71a99bf63c2e5d3e409dcf5359d2ef132f9f659b13b34998c9
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.