diff for duplicates of <20181213020907.13601-15-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 17c7d50..e1ac9e0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -180,11 +180,11 @@ index c38a63f56b7b..1cce69197235 100644 { struct audit_buffer *ab; @@ -1037,10 +1085,11 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) - if ((strcmp(args[0].from, "imasig")) = 0) + if ((strcmp(args[0].from, "imasig")) == 0) entry->flags |= IMA_DIGSIG_REQUIRED; else if (ima_hook_supports_modsig(entry->func) && -- strcmp(args[0].from, "imasig|modsig") = 0) -+ strcmp(args[0].from, "imasig|modsig") = 0) { +- strcmp(args[0].from, "imasig|modsig") == 0) ++ strcmp(args[0].from, "imasig|modsig") == 0) { entry->flags |= IMA_DIGSIG_REQUIRED | IMA_MODSIG_ALLOWED; - else @@ -243,7 +243,8 @@ index 045ad508cbb8..f87adc6748ac 100644 } @@ -227,6 +250,7 @@ struct ima_template_desc *ima_template_desc_current(void) ima_init_template_list(); - ima_template lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE); + ima_template = + lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE); + template_has_sig = find_sig_in_template(); } return ima_template; diff --git a/a/content_digest b/N1/content_digest index 918a2ed..0bcdad7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181213020907.13601-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v9 14/14] ima: Store the measurement again when appraising a modsig\0" - "Date\0Thu, 13 Dec 2018 02:09:07 +0000\0" + "Date\0Thu, 13 Dec 2018 00:09:07 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -206,11 +206,11 @@ " {\n" " \tstruct audit_buffer *ab;\n" "@@ -1037,10 +1085,11 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)\n" - " \t\t\tif ((strcmp(args[0].from, \"imasig\")) = 0)\n" + " \t\t\tif ((strcmp(args[0].from, \"imasig\")) == 0)\n" " \t\t\t\tentry->flags |= IMA_DIGSIG_REQUIRED;\n" " \t\t\telse if (ima_hook_supports_modsig(entry->func) &&\n" - "-\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") = 0)\n" - "+\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") = 0) {\n" + "-\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") == 0)\n" + "+\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") == 0) {\n" " \t\t\t\tentry->flags |= IMA_DIGSIG_REQUIRED\n" " \t\t\t\t\t\t| IMA_MODSIG_ALLOWED;\n" "-\t\t\telse\n" @@ -269,7 +269,8 @@ " }\n" "@@ -227,6 +250,7 @@ struct ima_template_desc *ima_template_desc_current(void)\n" " \t\tima_init_template_list();\n" - " \t\tima_template \t\t lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE);\n" + " \t\tima_template =\n" + " \t\t lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE);\n" "+\t\ttemplate_has_sig = find_sig_in_template();\n" " \t}\n" " \treturn ima_template;\n" @@ -305,4 +306,4 @@ " \t\t\t\t IMA_BPRM_APPRAISE | IMA_READ_APPRAISE | \\\n" " \t\t\t\t IMA_CREDS_APPRAISE)" -ead3930ed8351507e3bd84f578595f6e3e94b6493522b41cc4be663b4a52bc8a +88565bf9aa626a74f70029890f68ac66996c7d8f2e45bde37c4af7cd3ef58286
diff --git a/a/1.txt b/N2/1.txt index 17c7d50..e1ac9e0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -180,11 +180,11 @@ index c38a63f56b7b..1cce69197235 100644 { struct audit_buffer *ab; @@ -1037,10 +1085,11 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) - if ((strcmp(args[0].from, "imasig")) = 0) + if ((strcmp(args[0].from, "imasig")) == 0) entry->flags |= IMA_DIGSIG_REQUIRED; else if (ima_hook_supports_modsig(entry->func) && -- strcmp(args[0].from, "imasig|modsig") = 0) -+ strcmp(args[0].from, "imasig|modsig") = 0) { +- strcmp(args[0].from, "imasig|modsig") == 0) ++ strcmp(args[0].from, "imasig|modsig") == 0) { entry->flags |= IMA_DIGSIG_REQUIRED | IMA_MODSIG_ALLOWED; - else @@ -243,7 +243,8 @@ index 045ad508cbb8..f87adc6748ac 100644 } @@ -227,6 +250,7 @@ struct ima_template_desc *ima_template_desc_current(void) ima_init_template_list(); - ima_template lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE); + ima_template = + lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE); + template_has_sig = find_sig_in_template(); } return ima_template; diff --git a/a/content_digest b/N2/content_digest index 918a2ed..440103f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,27 @@ "ref\020181213020907.13601-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v9 14/14] ima: Store the measurement again when appraising a modsig\0" - "Date\0Thu, 13 Dec 2018 02:09:07 +0000\0" + "Date\0Thu, 13 Dec 2018 00:09:07 -0200\0" "To\0linux-integrity@vger.kernel.org\0" - "Cc\0linux-security-module@vger.kernel.org" - keyrings@vger.kernel.org - linux-crypto@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Cc\0Herbert Xu <herbert@gondor.apana.org.au>" linux-doc@vger.kernel.org + Dmitry Kasatkin <dmitry.kasatkin@gmail.com> + David S. Miller <davem@davemloft.net> + Jonathan Corbet <corbet@lwn.net> linux-kernel@vger.kernel.org Mimi Zohar <zohar@linux.ibm.com> - Dmitry Kasatkin <dmitry.kasatkin@gmail.com> James Morris <jmorris@namei.org> - Serge E. Hallyn <serge@hallyn.com> David Howells <dhowells@redhat.com> - David Woodhouse <dwmw2@infradead.org> - Jessica Yu <jeyu@kernel.org> - Herbert Xu <herbert@gondor.apana.org.au> - David S. Miller <davem@davemloft.net> - Jonathan Corbet <corbet@lwn.net> AKASHI Takahiro <takahiro.akashi@linaro.org> - " Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" + linux-security-module@vger.kernel.org + keyrings@vger.kernel.org + linux-crypto@vger.kernel.org + Jessica Yu <jeyu@kernel.org> + linuxppc-dev@lists.ozlabs.org + David Woodhouse <dwmw2@infradead.org> + Thiago Jung Bauermann <bauerman@linux.ibm.com> + " Serge E. Hallyn <serge@hallyn.com>\0" "\00:1\0" "b\0" "If the IMA template contains the 'sig' field, then the modsig should be\n" @@ -206,11 +206,11 @@ " {\n" " \tstruct audit_buffer *ab;\n" "@@ -1037,10 +1085,11 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)\n" - " \t\t\tif ((strcmp(args[0].from, \"imasig\")) = 0)\n" + " \t\t\tif ((strcmp(args[0].from, \"imasig\")) == 0)\n" " \t\t\t\tentry->flags |= IMA_DIGSIG_REQUIRED;\n" " \t\t\telse if (ima_hook_supports_modsig(entry->func) &&\n" - "-\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") = 0)\n" - "+\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") = 0) {\n" + "-\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") == 0)\n" + "+\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") == 0) {\n" " \t\t\t\tentry->flags |= IMA_DIGSIG_REQUIRED\n" " \t\t\t\t\t\t| IMA_MODSIG_ALLOWED;\n" "-\t\t\telse\n" @@ -269,7 +269,8 @@ " }\n" "@@ -227,6 +250,7 @@ struct ima_template_desc *ima_template_desc_current(void)\n" " \t\tima_init_template_list();\n" - " \t\tima_template \t\t lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE);\n" + " \t\tima_template =\n" + " \t\t lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE);\n" "+\t\ttemplate_has_sig = find_sig_in_template();\n" " \t}\n" " \treturn ima_template;\n" @@ -305,4 +306,4 @@ " \t\t\t\t IMA_BPRM_APPRAISE | IMA_READ_APPRAISE | \\\n" " \t\t\t\t IMA_CREDS_APPRAISE)" -ead3930ed8351507e3bd84f578595f6e3e94b6493522b41cc4be663b4a52bc8a +7ecc2ef1bd7b6c17814882ca719541c1b15f3590806dc22bd0e9f4101f9a9c97
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.