diff for duplicates of <20171018005331.2688-5-bauerman@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 8b1a08f..2e6f52e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,15 +22,15 @@ index 46408b9e62e8..0a32798cfc96 100644 { int xattr_len = strlen(xattr); -- if ((strlen(XATTR_NAME_POSIX_ACL_ACCESS) = xattr_len) -- && (strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) = 0)) -+ if (strlen(XATTR_NAME_POSIX_ACL_ACCESS) = xattr_len -+ && strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) = 0) +- if ((strlen(XATTR_NAME_POSIX_ACL_ACCESS) == xattr_len) +- && (strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) == 0)) ++ if (strlen(XATTR_NAME_POSIX_ACL_ACCESS) == xattr_len ++ && strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) == 0) return 1; -- if ((strlen(XATTR_NAME_POSIX_ACL_DEFAULT) = xattr_len) -- && (strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) = 0)) -+ if (strlen(XATTR_NAME_POSIX_ACL_DEFAULT) = xattr_len -+ && strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) = 0) +- if ((strlen(XATTR_NAME_POSIX_ACL_DEFAULT) == xattr_len) +- && (strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) == 0)) ++ if (strlen(XATTR_NAME_POSIX_ACL_DEFAULT) == xattr_len ++ && strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) == 0) return 1; return 0; } @@ -42,13 +42,13 @@ index 4d50b982b453..552f79fc4291 100644 rcu_read_unlock(); (*pos)++; -- return (&qe->later = &ima_measurements) ? NULL : qe; -+ return &qe->later = &ima_measurements ? NULL : qe; +- return (&qe->later == &ima_measurements) ? NULL : qe; ++ return &qe->later == &ima_measurements ? NULL : qe; } static void ima_measurements_stop(struct seq_file *m, void *v) @@ -141,7 +141,7 @@ int ima_measurements_show(struct seq_file *m, void *v) - if (e = NULL) + if (e == NULL) return -1; - template_name = (e->template_desc->name[0] != '\0') ? @@ -57,7 +57,7 @@ index 4d50b982b453..552f79fc4291 100644 /* @@ -228,7 +228,7 @@ static int ima_ascii_measurements_show(struct seq_file *m, void *v) - if (e = NULL) + if (e == NULL) return -1; - template_name = (e->template_desc->name[0] != '\0') ? @@ -73,8 +73,8 @@ index a02a86d51102..2ef7d33ba1fc 100644 rcu_read_lock(); hlist_for_each_entry_rcu(qe, &ima_htable.queue[key], hnext) { rc = memcmp(qe->entry->digest, digest_value, TPM_DIGEST_SIZE); -- if ((rc = 0) && (qe->entry->pcr = pcr)) { -+ if (rc = 0 && qe->entry->pcr = pcr) { +- if ((rc == 0) && (qe->entry->pcr == pcr)) { ++ if (rc == 0 && qe->entry->pcr == pcr) { ret = qe; break; } diff --git a/a/content_digest b/N1/content_digest index 36bdcf1..b6180c8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020171018005331.2688-1-bauerman@linux.vnet.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\0" "Subject\0[PATCH v5 04/18] evm, ima: Remove more superfluous parentheses\0" - "Date\0Wed, 18 Oct 2017 00:53:17 +0000\0" + "Date\0Tue, 17 Oct 2017 22:53:17 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -47,15 +47,15 @@ " {\n" " \tint xattr_len = strlen(xattr);\n" " \n" - "-\tif ((strlen(XATTR_NAME_POSIX_ACL_ACCESS) = xattr_len)\n" - "-\t && (strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) = 0))\n" - "+\tif (strlen(XATTR_NAME_POSIX_ACL_ACCESS) = xattr_len\n" - "+\t && strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) = 0)\n" + "-\tif ((strlen(XATTR_NAME_POSIX_ACL_ACCESS) == xattr_len)\n" + "-\t && (strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) == 0))\n" + "+\tif (strlen(XATTR_NAME_POSIX_ACL_ACCESS) == xattr_len\n" + "+\t && strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) == 0)\n" " \t\treturn 1;\n" - "-\tif ((strlen(XATTR_NAME_POSIX_ACL_DEFAULT) = xattr_len)\n" - "-\t && (strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) = 0))\n" - "+\tif (strlen(XATTR_NAME_POSIX_ACL_DEFAULT) = xattr_len\n" - "+\t && strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) = 0)\n" + "-\tif ((strlen(XATTR_NAME_POSIX_ACL_DEFAULT) == xattr_len)\n" + "-\t && (strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) == 0))\n" + "+\tif (strlen(XATTR_NAME_POSIX_ACL_DEFAULT) == xattr_len\n" + "+\t && strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) == 0)\n" " \t\treturn 1;\n" " \treturn 0;\n" " }\n" @@ -67,13 +67,13 @@ " \trcu_read_unlock();\n" " \t(*pos)++;\n" " \n" - "-\treturn (&qe->later = &ima_measurements) ? NULL : qe;\n" - "+\treturn &qe->later = &ima_measurements ? NULL : qe;\n" + "-\treturn (&qe->later == &ima_measurements) ? NULL : qe;\n" + "+\treturn &qe->later == &ima_measurements ? NULL : qe;\n" " }\n" " \n" " static void ima_measurements_stop(struct seq_file *m, void *v)\n" "@@ -141,7 +141,7 @@ int ima_measurements_show(struct seq_file *m, void *v)\n" - " \tif (e = NULL)\n" + " \tif (e == NULL)\n" " \t\treturn -1;\n" " \n" "-\ttemplate_name = (e->template_desc->name[0] != '\\0') ?\n" @@ -82,7 +82,7 @@ " \n" " \t/*\n" "@@ -228,7 +228,7 @@ static int ima_ascii_measurements_show(struct seq_file *m, void *v)\n" - " \tif (e = NULL)\n" + " \tif (e == NULL)\n" " \t\treturn -1;\n" " \n" "-\ttemplate_name = (e->template_desc->name[0] != '\\0') ?\n" @@ -98,8 +98,8 @@ " \trcu_read_lock();\n" " \thlist_for_each_entry_rcu(qe, &ima_htable.queue[key], hnext) {\n" " \t\trc = memcmp(qe->entry->digest, digest_value, TPM_DIGEST_SIZE);\n" - "-\t\tif ((rc = 0) && (qe->entry->pcr = pcr)) {\n" - "+\t\tif (rc = 0 && qe->entry->pcr = pcr) {\n" + "-\t\tif ((rc == 0) && (qe->entry->pcr == pcr)) {\n" + "+\t\tif (rc == 0 && qe->entry->pcr == pcr) {\n" " \t\t\tret = qe;\n" " \t\t\tbreak;\n" " \t\t}\n" @@ -122,4 +122,4 @@ " \telse\n" " \t\treturn binary_runtime_size + sizeof(struct ima_kexec_hdr);" -ce9fc458df71fd799f47b6b5b52b428fcc1e874ebfe0440f9a358a7141ae602c +ef029bb9db00dd41aeee37c1f59648176fa8d7955a88ca8637d7b44cd8d85637
diff --git a/a/1.txt b/N2/1.txt index 8b1a08f..f68fa2e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,15 +22,15 @@ index 46408b9e62e8..0a32798cfc96 100644 { int xattr_len = strlen(xattr); -- if ((strlen(XATTR_NAME_POSIX_ACL_ACCESS) = xattr_len) -- && (strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) = 0)) -+ if (strlen(XATTR_NAME_POSIX_ACL_ACCESS) = xattr_len -+ && strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) = 0) +- if ((strlen(XATTR_NAME_POSIX_ACL_ACCESS) == xattr_len) +- && (strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) == 0)) ++ if (strlen(XATTR_NAME_POSIX_ACL_ACCESS) == xattr_len ++ && strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) == 0) return 1; -- if ((strlen(XATTR_NAME_POSIX_ACL_DEFAULT) = xattr_len) -- && (strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) = 0)) -+ if (strlen(XATTR_NAME_POSIX_ACL_DEFAULT) = xattr_len -+ && strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) = 0) +- if ((strlen(XATTR_NAME_POSIX_ACL_DEFAULT) == xattr_len) +- && (strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) == 0)) ++ if (strlen(XATTR_NAME_POSIX_ACL_DEFAULT) == xattr_len ++ && strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) == 0) return 1; return 0; } @@ -42,13 +42,13 @@ index 4d50b982b453..552f79fc4291 100644 rcu_read_unlock(); (*pos)++; -- return (&qe->later = &ima_measurements) ? NULL : qe; -+ return &qe->later = &ima_measurements ? NULL : qe; +- return (&qe->later == &ima_measurements) ? NULL : qe; ++ return &qe->later == &ima_measurements ? NULL : qe; } static void ima_measurements_stop(struct seq_file *m, void *v) @@ -141,7 +141,7 @@ int ima_measurements_show(struct seq_file *m, void *v) - if (e = NULL) + if (e == NULL) return -1; - template_name = (e->template_desc->name[0] != '\0') ? @@ -57,7 +57,7 @@ index 4d50b982b453..552f79fc4291 100644 /* @@ -228,7 +228,7 @@ static int ima_ascii_measurements_show(struct seq_file *m, void *v) - if (e = NULL) + if (e == NULL) return -1; - template_name = (e->template_desc->name[0] != '\0') ? @@ -73,8 +73,8 @@ index a02a86d51102..2ef7d33ba1fc 100644 rcu_read_lock(); hlist_for_each_entry_rcu(qe, &ima_htable.queue[key], hnext) { rc = memcmp(qe->entry->digest, digest_value, TPM_DIGEST_SIZE); -- if ((rc = 0) && (qe->entry->pcr = pcr)) { -+ if (rc = 0 && qe->entry->pcr = pcr) { +- if ((rc == 0) && (qe->entry->pcr == pcr)) { ++ if (rc == 0 && qe->entry->pcr == pcr) { ret = qe; break; } @@ -96,3 +96,8 @@ index a02a86d51102..2ef7d33ba1fc 100644 return ULONG_MAX; else return binary_runtime_size + sizeof(struct ima_kexec_hdr); + +-- +To unsubscribe from this list: send the line "unsubscribe linux-security-module" in +the body of a message to majordomo at vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 36bdcf1..f8b1306 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,26 +1,8 @@ "ref\020171018005331.2688-1-bauerman@linux.vnet.ibm.com\0" - "From\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\0" + "From\0bauerman@linux.vnet.ibm.com (Thiago Jung Bauermann)\0" "Subject\0[PATCH v5 04/18] evm, ima: Remove more superfluous parentheses\0" - "Date\0Wed, 18 Oct 2017 00:53:17 +0000\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 - linux-kernel@vger.kernel.org - Mimi Zohar <zohar@linux.vnet.ibm.com> - Dmitry Kasatkin <dmitry.kasatkin@gmail.com> - James Morris <james.l.morris@oracle.com> - Serge E. Hallyn <serge@hallyn.com> - David Howells <dhowells@redhat.com> - David Woodhouse <dwmw2@infradead.org> - Jessica Yu <jeyu@redhat.com> - Rusty Russell <rusty@rustcorp.com.au> - Herbert Xu <herbert@gondor.apana.org.au> - David S. Miller <davem@davemloft.net> - AKASHI - Takahiro <takahiro.akashi@linaro.org> - " Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\0" + "Date\0Tue, 17 Oct 2017 22:53:17 -0200\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "This patch removes unnecessary parentheses from all EVM and IMA files\n" @@ -47,15 +29,15 @@ " {\n" " \tint xattr_len = strlen(xattr);\n" " \n" - "-\tif ((strlen(XATTR_NAME_POSIX_ACL_ACCESS) = xattr_len)\n" - "-\t && (strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) = 0))\n" - "+\tif (strlen(XATTR_NAME_POSIX_ACL_ACCESS) = xattr_len\n" - "+\t && strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) = 0)\n" + "-\tif ((strlen(XATTR_NAME_POSIX_ACL_ACCESS) == xattr_len)\n" + "-\t && (strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) == 0))\n" + "+\tif (strlen(XATTR_NAME_POSIX_ACL_ACCESS) == xattr_len\n" + "+\t && strncmp(XATTR_NAME_POSIX_ACL_ACCESS, xattr, xattr_len) == 0)\n" " \t\treturn 1;\n" - "-\tif ((strlen(XATTR_NAME_POSIX_ACL_DEFAULT) = xattr_len)\n" - "-\t && (strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) = 0))\n" - "+\tif (strlen(XATTR_NAME_POSIX_ACL_DEFAULT) = xattr_len\n" - "+\t && strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) = 0)\n" + "-\tif ((strlen(XATTR_NAME_POSIX_ACL_DEFAULT) == xattr_len)\n" + "-\t && (strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) == 0))\n" + "+\tif (strlen(XATTR_NAME_POSIX_ACL_DEFAULT) == xattr_len\n" + "+\t && strncmp(XATTR_NAME_POSIX_ACL_DEFAULT, xattr, xattr_len) == 0)\n" " \t\treturn 1;\n" " \treturn 0;\n" " }\n" @@ -67,13 +49,13 @@ " \trcu_read_unlock();\n" " \t(*pos)++;\n" " \n" - "-\treturn (&qe->later = &ima_measurements) ? NULL : qe;\n" - "+\treturn &qe->later = &ima_measurements ? NULL : qe;\n" + "-\treturn (&qe->later == &ima_measurements) ? NULL : qe;\n" + "+\treturn &qe->later == &ima_measurements ? NULL : qe;\n" " }\n" " \n" " static void ima_measurements_stop(struct seq_file *m, void *v)\n" "@@ -141,7 +141,7 @@ int ima_measurements_show(struct seq_file *m, void *v)\n" - " \tif (e = NULL)\n" + " \tif (e == NULL)\n" " \t\treturn -1;\n" " \n" "-\ttemplate_name = (e->template_desc->name[0] != '\\0') ?\n" @@ -82,7 +64,7 @@ " \n" " \t/*\n" "@@ -228,7 +228,7 @@ static int ima_ascii_measurements_show(struct seq_file *m, void *v)\n" - " \tif (e = NULL)\n" + " \tif (e == NULL)\n" " \t\treturn -1;\n" " \n" "-\ttemplate_name = (e->template_desc->name[0] != '\\0') ?\n" @@ -98,8 +80,8 @@ " \trcu_read_lock();\n" " \thlist_for_each_entry_rcu(qe, &ima_htable.queue[key], hnext) {\n" " \t\trc = memcmp(qe->entry->digest, digest_value, TPM_DIGEST_SIZE);\n" - "-\t\tif ((rc = 0) && (qe->entry->pcr = pcr)) {\n" - "+\t\tif (rc = 0 && qe->entry->pcr = pcr) {\n" + "-\t\tif ((rc == 0) && (qe->entry->pcr == pcr)) {\n" + "+\t\tif (rc == 0 && qe->entry->pcr == pcr) {\n" " \t\t\tret = qe;\n" " \t\t\tbreak;\n" " \t\t}\n" @@ -120,6 +102,11 @@ "+\tif (binary_runtime_size >= ULONG_MAX - sizeof(struct ima_kexec_hdr))\n" " \t\treturn ULONG_MAX;\n" " \telse\n" - " \t\treturn binary_runtime_size + sizeof(struct ima_kexec_hdr);" + " \t\treturn binary_runtime_size + sizeof(struct ima_kexec_hdr);\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" + "the body of a message to majordomo at vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -ce9fc458df71fd799f47b6b5b52b428fcc1e874ebfe0440f9a358a7141ae602c +92b0e4db6aaa24f4b278142a2694bc3173287f96a0f47fa7b5a3102e539716c1
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.