diff for duplicates of <20191111193303.12781-6-nramas@linux.microsoft.com> diff --git a/a/1.txt b/N1/1.txt index 18c3c21..916e17f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ index 47ad4f56c0a8..a9649b04b9f1 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -330,7 +330,7 @@ int ima_check_blacklist(struct integrity_iint_cache *iint, - if ((rc = -EPERM) && (iint->flags & IMA_MEASURE)) + if ((rc == -EPERM) && (iint->flags & IMA_MEASURE)) process_buffer_measurement(digest, digestsize, "blacklisted-hash", NONE, - pcr); @@ -90,7 +90,7 @@ index 68e15ff1fe8d..1bd5dbd8a077 100644 } + if ((keyring != NULL) && (keyrings != NULL) -+ && (strstr(keyrings, keyring) = NULL)) { ++ && (strstr(keyrings, keyring) == NULL)) { + return; + } + diff --git a/a/content_digest b/N1/content_digest index fbc2abc..b2e7736 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020191111193303.12781-1-nramas@linux.microsoft.com\0" "From\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\0" - "Subject\0[PATCH v5 05/10] IMA: Measure key if the IMA policy allows measurement for the keyring to which the\0" - "Date\0Mon, 11 Nov 2019 19:32:58 +0000\0" + "Subject\0[PATCH v5 05/10] IMA: Measure key if the IMA policy allows measurement for the keyring to which the key is linked to\0" + "Date\0Mon, 11 Nov 2019 11:32:58 -0800\0" "To\0zohar@linux.ibm.com" dhowells@redhat.com matthewgarrett@google.com @@ -50,7 +50,7 @@ "--- a/security/integrity/ima/ima_appraise.c\n" "+++ b/security/integrity/ima/ima_appraise.c\n" "@@ -330,7 +330,7 @@ int ima_check_blacklist(struct integrity_iint_cache *iint,\n" - " \t\tif ((rc = -EPERM) && (iint->flags & IMA_MEASURE))\n" + " \t\tif ((rc == -EPERM) && (iint->flags & IMA_MEASURE))\n" " \t\t\tprocess_buffer_measurement(digest, digestsize,\n" " \t\t\t\t\t\t \"blacklisted-hash\", NONE,\n" "-\t\t\t\t\t\t pcr);\n" @@ -105,7 +105,7 @@ " \t}\n" " \n" "+\tif ((keyring != NULL) && (keyrings != NULL)\n" - "+\t && (strstr(keyrings, keyring) = NULL)) {\n" + "+\t && (strstr(keyrings, keyring) == NULL)) {\n" "+\t\treturn;\n" "+\t}\n" "+\n" @@ -124,4 +124,4 @@ "-- \n" 2.17.1 -0e8829c57f8f0162de49835fb3bfa9200e16eb8071974cb185482759c0b37ca5 +e2443a10b3a853f99ecd9e25dd7a5fd7f960d05b08836de5143777c7d2e51dc8
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.