diff for duplicates of <20190628021934.4260-10-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index e282a34..86a344e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -132,7 +132,7 @@ index cc4500f93408..8b35a200e0cc 100644 - xattr_value, xattr_len, pcr, + xattr_value, xattr_len, modsig, pcr, template_desc); - if (rc = 0 && (action & IMA_APPRAISE_SUBMASK)) { + if (rc == 0 && (action & IMA_APPRAISE_SUBMASK)) { inode_lock(inode); diff --git a/security/integrity/ima/ima_modsig.c b/security/integrity/ima/ima_modsig.c index d438b87dba89..b01bbfeb1d98 100644 @@ -218,7 +218,7 @@ index 4c5b968c4721..4fc13e591f1d 100644 { struct audit_buffer *ab; @@ -1189,6 +1224,12 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) - else if (entry->action = APPRAISE) + else if (entry->action == APPRAISE) temp_ima_appraise |= ima_appraise_flag(entry->func); + if (!result && entry->flags & IMA_MODSIG_ALLOWED) { @@ -306,7 +306,7 @@ index baf4de45c5aa..22e71cd5ca02 100644 + &cur_digest, &cur_digestsize); + if (rc) + return rc; -+ else if (hash_algo = HASH_ALGO__LAST || cur_digestsize = 0) ++ else if (hash_algo == HASH_ALGO__LAST || cur_digestsize == 0) + /* There was some error collecting the digest. */ + return -EINVAL; + } diff --git a/a/content_digest b/N1/content_digest index f7ca91e..2aab11f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190628021934.4260-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v12 09/11] ima: Define ima-modsig template\0" - "Date\0Fri, 28 Jun 2019 02:19:32 +0000\0" + "Date\0Thu, 27 Jun 2019 23:19:32 -0300\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -158,7 +158,7 @@ "-\t\t\t\t xattr_value, xattr_len, pcr,\n" "+\t\t\t\t xattr_value, xattr_len, modsig, pcr,\n" " \t\t\t\t template_desc);\n" - " \tif (rc = 0 && (action & IMA_APPRAISE_SUBMASK)) {\n" + " \tif (rc == 0 && (action & IMA_APPRAISE_SUBMASK)) {\n" " \t\tinode_lock(inode);\n" "diff --git a/security/integrity/ima/ima_modsig.c b/security/integrity/ima/ima_modsig.c\n" "index d438b87dba89..b01bbfeb1d98 100644\n" @@ -244,7 +244,7 @@ " {\n" " \tstruct audit_buffer *ab;\n" "@@ -1189,6 +1224,12 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)\n" - " \telse if (entry->action = APPRAISE)\n" + " \telse if (entry->action == APPRAISE)\n" " \t\ttemp_ima_appraise |= ima_appraise_flag(entry->func);\n" " \n" "+\tif (!result && entry->flags & IMA_MODSIG_ALLOWED) {\n" @@ -332,7 +332,7 @@ "+\t\t\t\t\t &cur_digest, &cur_digestsize);\n" "+\t\tif (rc)\n" "+\t\t\treturn rc;\n" - "+\t\telse if (hash_algo = HASH_ALGO__LAST || cur_digestsize = 0)\n" + "+\t\telse if (hash_algo == HASH_ALGO__LAST || cur_digestsize == 0)\n" "+\t\t\t/* There was some error collecting the digest. */\n" "+\t\t\treturn -EINVAL;\n" "+\t}\n" @@ -394,4 +394,4 @@ "+\t\t\t struct ima_field_data *field_data);\n" #endif /* __LINUX_IMA_TEMPLATE_LIB_H */ -f2e2395badaa3b57859aad26c8b433c69828f21e641b6ea722725bac5b0cbeea +c852ac94905c85596ba4b76719223bf224c6c552a353ebbbb6e8b51d2a75dc32
diff --git a/a/1.txt b/N2/1.txt index e282a34..86a344e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -132,7 +132,7 @@ index cc4500f93408..8b35a200e0cc 100644 - xattr_value, xattr_len, pcr, + xattr_value, xattr_len, modsig, pcr, template_desc); - if (rc = 0 && (action & IMA_APPRAISE_SUBMASK)) { + if (rc == 0 && (action & IMA_APPRAISE_SUBMASK)) { inode_lock(inode); diff --git a/security/integrity/ima/ima_modsig.c b/security/integrity/ima/ima_modsig.c index d438b87dba89..b01bbfeb1d98 100644 @@ -218,7 +218,7 @@ index 4c5b968c4721..4fc13e591f1d 100644 { struct audit_buffer *ab; @@ -1189,6 +1224,12 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) - else if (entry->action = APPRAISE) + else if (entry->action == APPRAISE) temp_ima_appraise |= ima_appraise_flag(entry->func); + if (!result && entry->flags & IMA_MODSIG_ALLOWED) { @@ -306,7 +306,7 @@ index baf4de45c5aa..22e71cd5ca02 100644 + &cur_digest, &cur_digestsize); + if (rc) + return rc; -+ else if (hash_algo = HASH_ALGO__LAST || cur_digestsize = 0) ++ else if (hash_algo == HASH_ALGO__LAST || cur_digestsize == 0) + /* There was some error collecting the digest. */ + return -EINVAL; + } diff --git a/a/content_digest b/N2/content_digest index f7ca91e..559cf47 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,27 @@ "ref\020190628021934.4260-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v12 09/11] ima: Define ima-modsig template\0" - "Date\0Fri, 28 Jun 2019 02:19:32 +0000\0" + "Date\0Thu, 27 Jun 2019 23:19:32 -0300\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" "Define new \"d-modsig\" template field which holds the digest that is\n" @@ -158,7 +158,7 @@ "-\t\t\t\t xattr_value, xattr_len, pcr,\n" "+\t\t\t\t xattr_value, xattr_len, modsig, pcr,\n" " \t\t\t\t template_desc);\n" - " \tif (rc = 0 && (action & IMA_APPRAISE_SUBMASK)) {\n" + " \tif (rc == 0 && (action & IMA_APPRAISE_SUBMASK)) {\n" " \t\tinode_lock(inode);\n" "diff --git a/security/integrity/ima/ima_modsig.c b/security/integrity/ima/ima_modsig.c\n" "index d438b87dba89..b01bbfeb1d98 100644\n" @@ -244,7 +244,7 @@ " {\n" " \tstruct audit_buffer *ab;\n" "@@ -1189,6 +1224,12 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)\n" - " \telse if (entry->action = APPRAISE)\n" + " \telse if (entry->action == APPRAISE)\n" " \t\ttemp_ima_appraise |= ima_appraise_flag(entry->func);\n" " \n" "+\tif (!result && entry->flags & IMA_MODSIG_ALLOWED) {\n" @@ -332,7 +332,7 @@ "+\t\t\t\t\t &cur_digest, &cur_digestsize);\n" "+\t\tif (rc)\n" "+\t\t\treturn rc;\n" - "+\t\telse if (hash_algo = HASH_ALGO__LAST || cur_digestsize = 0)\n" + "+\t\telse if (hash_algo == HASH_ALGO__LAST || cur_digestsize == 0)\n" "+\t\t\t/* There was some error collecting the digest. */\n" "+\t\t\treturn -EINVAL;\n" "+\t}\n" @@ -394,4 +394,4 @@ "+\t\t\t struct ima_field_data *field_data);\n" #endif /* __LINUX_IMA_TEMPLATE_LIB_H */ -f2e2395badaa3b57859aad26c8b433c69828f21e641b6ea722725bac5b0cbeea +f5e402e8751069cdbb498af76ae55231ba528eb8710d5f427b1f1320d983cd27
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.