diff for duplicates of <20191118223818.3353-2-nramas@linux.microsoft.com> diff --git a/a/1.txt b/N1/1.txt index ff290e9..400993b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -55,16 +55,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 5d79588..9ea48e0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020191118223818.3353-1-nramas@linux.microsoft.com\0" "From\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\0" "Subject\0[PATCH v8 1/5] IMA: Add KEY_CHECK func to measure keys\0" - "Date\0Mon, 18 Nov 2019 22:38:14 +0000\0" + "Date\0Mon, 18 Nov 2019 14:38:14 -0800\0" "To\0zohar@linux.ibm.com" " linux-integrity@vger.kernel.org\0" "Cc\0linux-kernel@vger.kernel.org" @@ -65,16 +65,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" @@ -82,4 +82,4 @@ "-- \n" 2.17.1 -7c2df1ece21cdb1fa46e3ba3c552fe2a9a63414ca1336650dd5edecd27cee1f7 +a976d849910b17f0e48cfb3694b4b9c3b3ad647ce726a1b57dd1eb4e3ae0943d
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.