diff for duplicates of <1571836931.5104.95.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index c13829a..8a8144e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,17 +61,17 @@ There is no IMA hook in this patch. > { > 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 ef56389..0402ae1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020191023001818.3684-4-nramas@linux.microsoft.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v1 3/6] KEYS: ima hook to measure builtin_trusted_keys\0" - "Date\0Wed, 23 Oct 2019 13:22:11 +0000\0" + "Date\0Wed, 23 Oct 2019 09:22:11 -0400\0" "To\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>" dhowells@redhat.com casey@schaufler-ca.com @@ -77,17 +77,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" @@ -97,4 +97,4 @@ "\n" Mimi -0570087e0609e450be4af82f664a1fa0625f1565dc5598aac62deb0b0617686f +3955275caf82fd3c5ab956d0ac002bd14d5adbde1f7b2c86f1c8dd31b6d236fc
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.