diff for duplicates of <20181116200712.14154-15-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index aeec65a..a2f2bdd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -72,7 +72,7 @@ index d5abd22d502a..807b9b77b813 100644 + struct evm_ima_xattr_data *xattr_value) +{ + return iint->flags & IMA_READ_MEASURE && xattr_value && -+ xattr_value->type = IMA_MODSIG && ++ xattr_value->type == IMA_MODSIG && + ima_current_template_has_sig(); +} + @@ -87,7 +87,7 @@ index d5abd22d502a..807b9b77b813 100644 + if (action & IMA_MEASURE || store_measurement_again(iint, xattr_value)) ima_store_measurement(iint, file, pathname, xattr_value, xattr_len, pcr); - if (rc = 0 && (action & IMA_APPRAISE_SUBMASK)) { + if (rc == 0 && (action & IMA_APPRAISE_SUBMASK)) { diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 3e5a64053aa8..c0b39802e988 100644 --- a/security/integrity/ima/ima_policy.c @@ -185,11 +185,11 @@ index 3e5a64053aa8..c0b39802e988 100644 { struct audit_buffer *ab; @@ -1035,10 +1083,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 diff --git a/a/content_digest b/N1/content_digest index cd7c54c..6480e07 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181116200712.14154-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v8 14/14] ima: Store the measurement again when appraising a modsig\0" - "Date\0Fri, 16 Nov 2018 20:07:12 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:12 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -98,7 +98,7 @@ "+\t\t\t\t struct evm_ima_xattr_data *xattr_value)\n" "+{\n" "+\treturn iint->flags & IMA_READ_MEASURE && xattr_value &&\n" - "+\t\txattr_value->type = IMA_MODSIG &&\n" + "+\t\txattr_value->type == IMA_MODSIG &&\n" "+\t\tima_current_template_has_sig();\n" "+}\n" "+\n" @@ -113,7 +113,7 @@ "+\tif (action & IMA_MEASURE || store_measurement_again(iint, xattr_value))\n" " \t\tima_store_measurement(iint, file, pathname,\n" " \t\t\t\t xattr_value, xattr_len, pcr);\n" - " \tif (rc = 0 && (action & IMA_APPRAISE_SUBMASK)) {\n" + " \tif (rc == 0 && (action & IMA_APPRAISE_SUBMASK)) {\n" "diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c\n" "index 3e5a64053aa8..c0b39802e988 100644\n" "--- a/security/integrity/ima/ima_policy.c\n" @@ -211,11 +211,11 @@ " {\n" " \tstruct audit_buffer *ab;\n" "@@ -1035,10 +1083,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" @@ -293,4 +293,4 @@ " \t\t\t\t IMA_BPRM_APPRAISE | IMA_READ_APPRAISE | \\\n" " \t\t\t\t IMA_CREDS_APPRAISE)" -915a1906cd7189902de2d78c6ff602054c69454768e046c2e69ed9ca047205f6 +55013573f96319c4195e97dc448fcc93ce842ace80687cbc514092730e6bfd7c
diff --git a/a/1.txt b/N2/1.txt index aeec65a..a2f2bdd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -72,7 +72,7 @@ index d5abd22d502a..807b9b77b813 100644 + struct evm_ima_xattr_data *xattr_value) +{ + return iint->flags & IMA_READ_MEASURE && xattr_value && -+ xattr_value->type = IMA_MODSIG && ++ xattr_value->type == IMA_MODSIG && + ima_current_template_has_sig(); +} + @@ -87,7 +87,7 @@ index d5abd22d502a..807b9b77b813 100644 + if (action & IMA_MEASURE || store_measurement_again(iint, xattr_value)) ima_store_measurement(iint, file, pathname, xattr_value, xattr_len, pcr); - if (rc = 0 && (action & IMA_APPRAISE_SUBMASK)) { + if (rc == 0 && (action & IMA_APPRAISE_SUBMASK)) { diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 3e5a64053aa8..c0b39802e988 100644 --- a/security/integrity/ima/ima_policy.c @@ -185,11 +185,11 @@ index 3e5a64053aa8..c0b39802e988 100644 { struct audit_buffer *ab; @@ -1035,10 +1083,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 diff --git a/a/content_digest b/N2/content_digest index cd7c54c..c67f486 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,27 @@ "ref\020181116200712.14154-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v8 14/14] ima: Store the measurement again when appraising a modsig\0" - "Date\0Fri, 16 Nov 2018 20:07:12 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:12 -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" @@ -98,7 +98,7 @@ "+\t\t\t\t struct evm_ima_xattr_data *xattr_value)\n" "+{\n" "+\treturn iint->flags & IMA_READ_MEASURE && xattr_value &&\n" - "+\t\txattr_value->type = IMA_MODSIG &&\n" + "+\t\txattr_value->type == IMA_MODSIG &&\n" "+\t\tima_current_template_has_sig();\n" "+}\n" "+\n" @@ -113,7 +113,7 @@ "+\tif (action & IMA_MEASURE || store_measurement_again(iint, xattr_value))\n" " \t\tima_store_measurement(iint, file, pathname,\n" " \t\t\t\t xattr_value, xattr_len, pcr);\n" - " \tif (rc = 0 && (action & IMA_APPRAISE_SUBMASK)) {\n" + " \tif (rc == 0 && (action & IMA_APPRAISE_SUBMASK)) {\n" "diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c\n" "index 3e5a64053aa8..c0b39802e988 100644\n" "--- a/security/integrity/ima/ima_policy.c\n" @@ -211,11 +211,11 @@ " {\n" " \tstruct audit_buffer *ab;\n" "@@ -1035,10 +1083,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" @@ -293,4 +293,4 @@ " \t\t\t\t IMA_BPRM_APPRAISE | IMA_READ_APPRAISE | \\\n" " \t\t\t\t IMA_CREDS_APPRAISE)" -915a1906cd7189902de2d78c6ff602054c69454768e046c2e69ed9ca047205f6 +a0c8057f3e320510c9294dd549f09b3ffb4ae5396542288e3cdd3cc89db0e513
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.