diff for duplicates of <1572523851.5028.45.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 693dc49..1da41d3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -113,9 +113,9 @@ included in each of the patches descriptions. > { > int i; > -> - if (func = KEXEC_CMDLINE) { -> + if ((func = KEXEC_CMDLINE) || (func = KEYRING_CHECK)) { -> if ((rule->flags & IMA_FUNC) && (rule->func = func)) +> - if (func == KEXEC_CMDLINE) { +> + if ((func == KEXEC_CMDLINE) || (func == KEYRING_CHECK)) { +> if ((rule->flags & IMA_FUNC) && (rule->func == func)) > return true; > return false; > diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c diff --git a/a/content_digest b/N1/content_digest index 8cc4dab..1f80a39 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020191031011910.2574-4-nramas@linux.microsoft.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v3 3/9] KEYS: Added KEYRING_CHECK policy for key measurement\0" - "Date\0Thu, 31 Oct 2019 12:10:51 +0000\0" + "Date\0Thu, 31 Oct 2019 08:10:51 -0400\0" "To\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>" dhowells@redhat.com matthewgarrett@google.com @@ -130,9 +130,9 @@ "> {\n" "> \tint i;\n" "> \n" - "> -\tif (func = KEXEC_CMDLINE) {\n" - "> +\tif ((func = KEXEC_CMDLINE) || (func = KEYRING_CHECK)) {\n" - "> \t\tif ((rule->flags & IMA_FUNC) && (rule->func = func))\n" + "> -\tif (func == KEXEC_CMDLINE) {\n" + "> +\tif ((func == KEXEC_CMDLINE) || (func == KEYRING_CHECK)) {\n" + "> \t\tif ((rule->flags & IMA_FUNC) && (rule->func == func))\n" "> \t\t\treturn true;\n" "> \t\treturn false;\n" "> diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c\n" @@ -157,4 +157,4 @@ "> \t\tima_free_measure_key_entry(entry);\n" "> \t}" -8a639570b6efb6efb90c7dbdc7d2d5e18396bd8090de99fa168eda91f907d788 +9d7a9aff5a7693925146b9f655b957e16fa8ddbb98b56720e380945ad1de9357
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.