diff for duplicates of <1573578296.17949.41.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 8c3f48a..baa8f7d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On Mon, 2019-11-11 at 11:32 -0800, Lakshmi Ramasubramanian wrote: > measure asymmetric keys. This new feature measures "keys" based on policy, not "keyrings". - Please change the name to KEY_CHECK. + Please change the name to KEY_CHECK. > > Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> @@ -57,16 +57,16 @@ This new feature measures "keys" based on policy, not "keyrings". > { > 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; > @@ -997,6 +997,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) > entry->func = POLICY_CHECK; -> else if (strcmp(args[0].from, "KEXEC_CMDLINE") = 0) +> else if (strcmp(args[0].from, "KEXEC_CMDLINE") == 0) > entry->func = KEXEC_CMDLINE; -> + else if (strcmp(args[0].from, "KEYRING_CHECK") = 0) +> + else if (strcmp(args[0].from, "KEYRING_CHECK") == 0) > + entry->func = KEYRING_CHECK; > else > result = -EINVAL; diff --git a/a/content_digest b/N1/content_digest index 35202de..fa314cb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020191111193303.12781-2-nramas@linux.microsoft.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v5 01/10] IMA: Added KEYRING_CHECK func in IMA policy to measure keys\0" - "Date\0Tue, 12 Nov 2019 17:04:56 +0000\0" + "Date\0Tue, 12 Nov 2019 12:04:56 -0500\0" "To\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>" dhowells@redhat.com matthewgarrett@google.com @@ -22,7 +22,7 @@ "> measure asymmetric keys.\n" "\n" "This new feature measures \"keys\" based on policy, not \"keyrings\".\n" - "\342\224\254\303\241Please change the name to KEY_CHECK.\n" + "\302\240Please change the name to KEY_CHECK.\n" "\n" "> \n" "> Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\n" @@ -73,19 +73,19 @@ "> {\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" "> @@ -997,6 +997,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)\n" "> \t\t\t\tentry->func = POLICY_CHECK;\n" - "> \t\t\telse if (strcmp(args[0].from, \"KEXEC_CMDLINE\") = 0)\n" + "> \t\t\telse if (strcmp(args[0].from, \"KEXEC_CMDLINE\") == 0)\n" "> \t\t\t\tentry->func = KEXEC_CMDLINE;\n" - "> +\t\t\telse if (strcmp(args[0].from, \"KEYRING_CHECK\") = 0)\n" + "> +\t\t\telse if (strcmp(args[0].from, \"KEYRING_CHECK\") == 0)\n" "> +\t\t\t\tentry->func = KEYRING_CHECK;\n" "> \t\t\telse\n" "> \t\t\t\tresult = -EINVAL;\n" "> \t\t\tif (!result)" -9751ffe546994ca26f541e5608e74bf6f1c3d0345276687f80d5ca7f40193958 +b5a880ab8aacc1ab5940745cbad4e0529761e42abed490ea9caecc92f1c2e4ed
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.