diff for duplicates of <1573676066.4843.18.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index d7d122d..fefa3f5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -63,7 +63,7 @@ On Wed, 2019-11-13 at 10:46 -0800, Lakshmi Ramasubramanian wrote: > + This addition has nothing to do with defining a new IMA hook and -should be a separate patch.  This can be posted independently of this +should be a separate patch. This can be posted independently of this patch set. Mimi @@ -79,16 +79,16 @@ Mimi > { > int i; > -> - if (func = KEXEC_CMDLINE) { -> + if ((func = KEXEC_CMDLINE) || (func = KEY_CHECK)) { -> if ((rule->flags & IMA_FUNC) && (rule->func = func)) +> - if (func == KEXEC_CMDLINE) { +> + if ((func == KEXEC_CMDLINE) || (func == KEY_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, "KEY_CHECK") = 0) +> + else if (strcmp(args[0].from, "KEY_CHECK") == 0) > + entry->func = KEY_CHECK; > else > result = -EINVAL; diff --git a/a/content_digest b/N1/content_digest index ab1cbb1..5cbdc1e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020191113184658.2862-2-nramas@linux.microsoft.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v6 1/3] IMA: Add KEY_CHECK func to measure keys\0" - "Date\0Wed, 13 Nov 2019 20:14:26 +0000\0" + "Date\0Wed, 13 Nov 2019 15:14:26 -0500\0" "To\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>" dhowells@redhat.com matthewgarrett@google.com @@ -79,7 +79,7 @@ "> +\n" "\n" "This addition has nothing to do with defining a new IMA hook and\n" - "should be a separate patch. \342\224\254\303\241This can be posted independently of this\n" + "should be a separate patch. \302\240This can be posted independently of this\n" "patch set.\n" "\n" "Mimi\n" @@ -95,19 +95,19 @@ "> {\n" "> \tint i;\n" "> \n" - "> -\tif (func = KEXEC_CMDLINE) {\n" - "> +\tif ((func = KEXEC_CMDLINE) || (func = KEY_CHECK)) {\n" - "> \t\tif ((rule->flags & IMA_FUNC) && (rule->func = func))\n" + "> -\tif (func == KEXEC_CMDLINE) {\n" + "> +\tif ((func == KEXEC_CMDLINE) || (func == KEY_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, \"KEY_CHECK\") = 0)\n" + "> +\t\t\telse if (strcmp(args[0].from, \"KEY_CHECK\") == 0)\n" "> +\t\t\t\tentry->func = KEY_CHECK;\n" "> \t\t\telse\n" "> \t\t\t\tresult = -EINVAL;\n" "> \t\t\tif (!result)" -9ac898b788ce94ab5723b566378cdb64a70d5a196429a8dd43b078835369ecfd +31c9ef4514af1a542fecf0ee2cb8547ce43ce111c7b749cb45af8039ff28e86c
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.