diff for duplicates of <20191106190116.2578-7-nramas@linux.microsoft.com> diff --git a/a/1.txt b/N1/1.txt index a350ae4..fabc8b4 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 b6d17f37ba61..56540357c854 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 fc1092b..5b4efc5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020191106190116.2578-1-nramas@linux.microsoft.com\0" "From\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\0" - "Subject\0[PATCH v4 06/10] IMA: Measure key if the IMA policy allows measurement for the keyring to which the\0" - "Date\0Wed, 06 Nov 2019 19:01:12 +0000\0" + "Subject\0[PATCH v4 06/10] IMA: Measure key if the IMA policy allows measurement for the keyring to which the key is linked to\0" + "Date\0Wed, 6 Nov 2019 11:01:12 -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 -d99317afb9415376890fd28ec37f8381d4d398e710e680577276af5fc152898c +389c82367615268c0cc2c3a0fefb343d2cd6eb119cd64c7193f535c15f77def3
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.