diff for duplicates of <20191111193303.12781-2-nramas@linux.microsoft.com> diff --git a/a/1.txt b/N1/1.txt index 94181b6..d608666 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,16 +52,16 @@ index f19a895ad7cd..9ca32ffaaa9d 100644 { 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 4934495..4b42698 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020191111193303.12781-1-nramas@linux.microsoft.com\0" "From\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\0" "Subject\0[PATCH v5 01/10] IMA: Added KEYRING_CHECK func in IMA policy to measure keys\0" - "Date\0Mon, 11 Nov 2019 19:32:54 +0000\0" + "Date\0Mon, 11 Nov 2019 11:32:54 -0800\0" "To\0zohar@linux.ibm.com" dhowells@redhat.com matthewgarrett@google.com @@ -67,16 +67,16 @@ " {\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" @@ -84,4 +84,4 @@ "-- \n" 2.17.1 -3ab461ba879f8cb73585e246b4595dc5612b5b91e7fecef64a3f625023142260 +169098f9d8c2a161a6b19f382d8a4acd6baa091aec51437b36aeec4b2a30f9fb
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.