diff for duplicates of <20191211164707.4698-3-nramas@linux.microsoft.com> diff --git a/a/1.txt b/N1/1.txt index ad33295..12c1ff8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,16 +52,16 @@ index f19a895ad7cd..1525a28fd705 100644 { 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 1067cce..9754975 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020191211164707.4698-1-nramas@linux.microsoft.com\0" "From\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\0" "Subject\0[PATCH v11 2/6] IMA: Add KEY_CHECK func to measure keys\0" - "Date\0Wed, 11 Dec 2019 16:47:03 +0000\0" + "Date\0Wed, 11 Dec 2019 08:47:03 -0800\0" "To\0zohar@linux.ibm.com" " linux-integrity@vger.kernel.org\0" "Cc\0eric.snowberg@oracle.com" @@ -68,16 +68,16 @@ " {\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" @@ -85,4 +85,4 @@ "-- \n" 2.17.1 -b3f478c3a67789c974ebab9a81976a604edbd53dd3ac738a8fa08ecd5583d2d4 +9cb60c4d86c9d22f5bff8acf021f73cd75b17e36c398fca2bd3751ea5d87c320
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.