diff for duplicates of <20191023001818.3684-4-nramas@linux.microsoft.com> diff --git a/a/1.txt b/N1/1.txt index 8da1bbd..1fc4bb0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,17 +57,17 @@ index 6df7f641ff66..944636076152 100644 { int i; -- if (func = KEXEC_CMDLINE) { -+ if ((func = KEXEC_CMDLINE) || (func = BUILTIN_TRUSTED_KEYS)) { - if ((rule->flags & IMA_FUNC) && (rule->func = func)) +- if (func == KEXEC_CMDLINE) { ++ if ((func == KEXEC_CMDLINE) || (func == BUILTIN_TRUSTED_KEYS)) { + if ((rule->flags & IMA_FUNC) && (rule->func == func)) return true; return false; @@ -959,6 +959,9 @@ 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, -+ "BUILTIN_TRUSTED_KEYS") = 0) ++ "BUILTIN_TRUSTED_KEYS") == 0) + entry->func = BUILTIN_TRUSTED_KEYS; else result = -EINVAL; diff --git a/a/content_digest b/N1/content_digest index 9f6869a..8f0b639 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020191023001818.3684-1-nramas@linux.microsoft.com\0" "From\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\0" "Subject\0[PATCH v1 3/6] KEYS: ima hook to measure builtin_trusted_keys\0" - "Date\0Wed, 23 Oct 2019 00:18:15 +0000\0" + "Date\0Tue, 22 Oct 2019 17:18:15 -0700\0" "To\0zohar@linux.ibm.com" dhowells@redhat.com casey@schaufler-ca.com @@ -73,17 +73,17 @@ " {\n" " \tint i;\n" " \n" - "-\tif (func = KEXEC_CMDLINE) {\n" - "+\tif ((func = KEXEC_CMDLINE) || (func = BUILTIN_TRUSTED_KEYS)) {\n" - " \t\tif ((rule->flags & IMA_FUNC) && (rule->func = func))\n" + "-\tif (func == KEXEC_CMDLINE) {\n" + "+\tif ((func == KEXEC_CMDLINE) || (func == BUILTIN_TRUSTED_KEYS)) {\n" + " \t\tif ((rule->flags & IMA_FUNC) && (rule->func == func))\n" " \t\t\treturn true;\n" " \t\treturn false;\n" "@@ -959,6 +959,9 @@ 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,\n" - "+\t\t\t\t\t\"BUILTIN_TRUSTED_KEYS\") = 0)\n" + "+\t\t\t\t\t\"BUILTIN_TRUSTED_KEYS\") == 0)\n" "+\t\t\t\tentry->func = BUILTIN_TRUSTED_KEYS;\n" " \t\t\telse\n" " \t\t\t\tresult = -EINVAL;\n" @@ -91,4 +91,4 @@ "-- \n" 2.17.1 -3676f968325c91b9ff1a9e481d0fc906e0013a505441d822441629a1e09d91ee +08e9d6dfeb87ddeca3955265e3280386be32ede02768201e38eede81b61c2b07
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.