diff for duplicates of <20171018005331.2688-3-bauerman@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index b43fde1..159a79b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,24 +23,24 @@ index ec7dfa02c051..bce0b36778bd 100644 status = evm_verifyxattr(dentry, XATTR_NAME_IMA, xattr_value, rc, iint); - if ((status != INTEGRITY_PASS) && (status != INTEGRITY_UNKNOWN)) { -- if ((status = INTEGRITY_NOLABEL) -- || (status = INTEGRITY_NOXATTRS)) +- if ((status == INTEGRITY_NOLABEL) +- || (status == INTEGRITY_NOXATTRS)) + if (status != INTEGRITY_PASS && status != INTEGRITY_UNKNOWN) { -+ if (status = INTEGRITY_NOLABEL || status = INTEGRITY_NOXATTRS) ++ if (status == INTEGRITY_NOLABEL || status == INTEGRITY_NOXATTRS) cause = "missing-HMAC"; - else if (status = INTEGRITY_FAIL) + else if (status == INTEGRITY_FAIL) cause = "invalid-HMAC"; @@ -293,10 +292,10 @@ int ima_appraise_measurement(enum ima_hooks func, xattr_value->type != EVM_IMA_XATTR_DIGSIG)) { if (!ima_fix_xattr(dentry, iint)) status = INTEGRITY_PASS; -- } else if ((inode->i_size = 0) && -+ } else if (inode->i_size = 0 && +- } else if ((inode->i_size == 0) && ++ } else if (inode->i_size == 0 && (iint->flags & IMA_NEW_FILE) && - (xattr_value && -- xattr_value->type = EVM_IMA_XATTR_DIGSIG)) { +- xattr_value->type == EVM_IMA_XATTR_DIGSIG)) { + xattr_value && -+ xattr_value->type = EVM_IMA_XATTR_DIGSIG) { ++ xattr_value->type == EVM_IMA_XATTR_DIGSIG) { status = INTEGRITY_PASS; } integrity_audit_msg(AUDIT_INTEGRITY_DATA, inode, filename, diff --git a/a/content_digest b/N1/content_digest index c4f6c36..496cac5 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 02/18] ima: Remove some superfluous parentheses\0" - "Date\0Wed, 18 Oct 2017 00:53:15 +0000\0" + "Date\0Tue, 17 Oct 2017 22:53:15 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0Jessica Yu <jeyu@redhat.com>" linuxppc-dev@lists.ozlabs.org @@ -48,24 +48,24 @@ " \n" " \tstatus = evm_verifyxattr(dentry, XATTR_NAME_IMA, xattr_value, rc, iint);\n" "-\tif ((status != INTEGRITY_PASS) && (status != INTEGRITY_UNKNOWN)) {\n" - "-\t\tif ((status = INTEGRITY_NOLABEL)\n" - "-\t\t || (status = INTEGRITY_NOXATTRS))\n" + "-\t\tif ((status == INTEGRITY_NOLABEL)\n" + "-\t\t || (status == INTEGRITY_NOXATTRS))\n" "+\tif (status != INTEGRITY_PASS && status != INTEGRITY_UNKNOWN) {\n" - "+\t\tif (status = INTEGRITY_NOLABEL || status = INTEGRITY_NOXATTRS)\n" + "+\t\tif (status == INTEGRITY_NOLABEL || status == INTEGRITY_NOXATTRS)\n" " \t\t\tcause = \"missing-HMAC\";\n" - " \t\telse if (status = INTEGRITY_FAIL)\n" + " \t\telse if (status == INTEGRITY_FAIL)\n" " \t\t\tcause = \"invalid-HMAC\";\n" "@@ -293,10 +292,10 @@ int ima_appraise_measurement(enum ima_hooks func,\n" " \t\t xattr_value->type != EVM_IMA_XATTR_DIGSIG)) {\n" " \t\t\tif (!ima_fix_xattr(dentry, iint))\n" " \t\t\t\tstatus = INTEGRITY_PASS;\n" - "-\t\t} else if ((inode->i_size = 0) &&\n" - "+\t\t} else if (inode->i_size = 0 &&\n" + "-\t\t} else if ((inode->i_size == 0) &&\n" + "+\t\t} else if (inode->i_size == 0 &&\n" " \t\t\t (iint->flags & IMA_NEW_FILE) &&\n" "-\t\t\t (xattr_value &&\n" - "-\t\t\t xattr_value->type = EVM_IMA_XATTR_DIGSIG)) {\n" + "-\t\t\t xattr_value->type == EVM_IMA_XATTR_DIGSIG)) {\n" "+\t\t\t xattr_value &&\n" - "+\t\t\t xattr_value->type = EVM_IMA_XATTR_DIGSIG) {\n" + "+\t\t\t xattr_value->type == EVM_IMA_XATTR_DIGSIG) {\n" " \t\t\tstatus = INTEGRITY_PASS;\n" " \t\t}\n" " \t\tintegrity_audit_msg(AUDIT_INTEGRITY_DATA, inode, filename,\n" @@ -83,4 +83,4 @@ " \n" " \trc = ima_write_template_field_data(xattr_value, xattr_len, fmt," -97a2cac62a26150a8ecc10e9ffb0e6d67d7ebb5a921c4f7ac8034261bb01768b +47802d7e140eb1dc50c2dc1ef1f2cb90395c6e1093b812cca3800e1d0077b485
diff --git a/a/1.txt b/N2/1.txt index b43fde1..159a79b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -23,24 +23,24 @@ index ec7dfa02c051..bce0b36778bd 100644 status = evm_verifyxattr(dentry, XATTR_NAME_IMA, xattr_value, rc, iint); - if ((status != INTEGRITY_PASS) && (status != INTEGRITY_UNKNOWN)) { -- if ((status = INTEGRITY_NOLABEL) -- || (status = INTEGRITY_NOXATTRS)) +- if ((status == INTEGRITY_NOLABEL) +- || (status == INTEGRITY_NOXATTRS)) + if (status != INTEGRITY_PASS && status != INTEGRITY_UNKNOWN) { -+ if (status = INTEGRITY_NOLABEL || status = INTEGRITY_NOXATTRS) ++ if (status == INTEGRITY_NOLABEL || status == INTEGRITY_NOXATTRS) cause = "missing-HMAC"; - else if (status = INTEGRITY_FAIL) + else if (status == INTEGRITY_FAIL) cause = "invalid-HMAC"; @@ -293,10 +292,10 @@ int ima_appraise_measurement(enum ima_hooks func, xattr_value->type != EVM_IMA_XATTR_DIGSIG)) { if (!ima_fix_xattr(dentry, iint)) status = INTEGRITY_PASS; -- } else if ((inode->i_size = 0) && -+ } else if (inode->i_size = 0 && +- } else if ((inode->i_size == 0) && ++ } else if (inode->i_size == 0 && (iint->flags & IMA_NEW_FILE) && - (xattr_value && -- xattr_value->type = EVM_IMA_XATTR_DIGSIG)) { +- xattr_value->type == EVM_IMA_XATTR_DIGSIG)) { + xattr_value && -+ xattr_value->type = EVM_IMA_XATTR_DIGSIG) { ++ xattr_value->type == EVM_IMA_XATTR_DIGSIG) { status = INTEGRITY_PASS; } integrity_audit_msg(AUDIT_INTEGRITY_DATA, inode, filename, diff --git a/a/content_digest b/N2/content_digest index c4f6c36..d675d63 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,26 +1,26 @@ "ref\020171018005331.2688-1-bauerman@linux.vnet.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\0" "Subject\0[PATCH v5 02/18] ima: Remove some superfluous parentheses\0" - "Date\0Wed, 18 Oct 2017 00:53:15 +0000\0" + "Date\0Tue, 17 Oct 2017 22:53:15 -0200\0" "To\0linux-integrity@vger.kernel.org\0" - "Cc\0Jessica Yu <jeyu@redhat.com>" + "Cc\0linux-security-module@vger.kernel.org" + keyrings@vger.kernel.org + linux-crypto@vger.kernel.org linuxppc-dev@lists.ozlabs.org - Rusty Russell <rusty@rustcorp.com.au> linux-kernel@vger.kernel.org - David S. Miller <davem@davemloft.net> + 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> - linux-security-module@vger.kernel.org - keyrings@vger.kernel.org - linux-crypto@vger.kernel.org - James Morris <james.l.morris@oracle.com> - Dmitry Kasatkin <dmitry.kasatkin@gmail.com> - Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - Herbert Xu <herbert@gondor.apana.org.au> - Mimi Zohar <zohar@linux.vnet.ibm.com> - David Woodhouse <dwmw2@infradead.org> - " Serge E. Hallyn <serge@hallyn.com>\0" + " Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\0" "\00:1\0" "b\0" "Superfluous parentheses just add clutter to the code, making it harder to\n" @@ -48,24 +48,24 @@ " \n" " \tstatus = evm_verifyxattr(dentry, XATTR_NAME_IMA, xattr_value, rc, iint);\n" "-\tif ((status != INTEGRITY_PASS) && (status != INTEGRITY_UNKNOWN)) {\n" - "-\t\tif ((status = INTEGRITY_NOLABEL)\n" - "-\t\t || (status = INTEGRITY_NOXATTRS))\n" + "-\t\tif ((status == INTEGRITY_NOLABEL)\n" + "-\t\t || (status == INTEGRITY_NOXATTRS))\n" "+\tif (status != INTEGRITY_PASS && status != INTEGRITY_UNKNOWN) {\n" - "+\t\tif (status = INTEGRITY_NOLABEL || status = INTEGRITY_NOXATTRS)\n" + "+\t\tif (status == INTEGRITY_NOLABEL || status == INTEGRITY_NOXATTRS)\n" " \t\t\tcause = \"missing-HMAC\";\n" - " \t\telse if (status = INTEGRITY_FAIL)\n" + " \t\telse if (status == INTEGRITY_FAIL)\n" " \t\t\tcause = \"invalid-HMAC\";\n" "@@ -293,10 +292,10 @@ int ima_appraise_measurement(enum ima_hooks func,\n" " \t\t xattr_value->type != EVM_IMA_XATTR_DIGSIG)) {\n" " \t\t\tif (!ima_fix_xattr(dentry, iint))\n" " \t\t\t\tstatus = INTEGRITY_PASS;\n" - "-\t\t} else if ((inode->i_size = 0) &&\n" - "+\t\t} else if (inode->i_size = 0 &&\n" + "-\t\t} else if ((inode->i_size == 0) &&\n" + "+\t\t} else if (inode->i_size == 0 &&\n" " \t\t\t (iint->flags & IMA_NEW_FILE) &&\n" "-\t\t\t (xattr_value &&\n" - "-\t\t\t xattr_value->type = EVM_IMA_XATTR_DIGSIG)) {\n" + "-\t\t\t xattr_value->type == EVM_IMA_XATTR_DIGSIG)) {\n" "+\t\t\t xattr_value &&\n" - "+\t\t\t xattr_value->type = EVM_IMA_XATTR_DIGSIG) {\n" + "+\t\t\t xattr_value->type == EVM_IMA_XATTR_DIGSIG) {\n" " \t\t\tstatus = INTEGRITY_PASS;\n" " \t\t}\n" " \t\tintegrity_audit_msg(AUDIT_INTEGRITY_DATA, inode, filename,\n" @@ -83,4 +83,4 @@ " \n" " \trc = ima_write_template_field_data(xattr_value, xattr_len, fmt," -97a2cac62a26150a8ecc10e9ffb0e6d67d7ebb5a921c4f7ac8034261bb01768b +e6a34d46cbcadf589384ab7b3179f5b5cf4c23971c58143506df7f0ba82114ed
diff --git a/a/1.txt b/N3/1.txt index b43fde1..c86ddf3 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -23,24 +23,24 @@ index ec7dfa02c051..bce0b36778bd 100644 status = evm_verifyxattr(dentry, XATTR_NAME_IMA, xattr_value, rc, iint); - if ((status != INTEGRITY_PASS) && (status != INTEGRITY_UNKNOWN)) { -- if ((status = INTEGRITY_NOLABEL) -- || (status = INTEGRITY_NOXATTRS)) +- if ((status == INTEGRITY_NOLABEL) +- || (status == INTEGRITY_NOXATTRS)) + if (status != INTEGRITY_PASS && status != INTEGRITY_UNKNOWN) { -+ if (status = INTEGRITY_NOLABEL || status = INTEGRITY_NOXATTRS) ++ if (status == INTEGRITY_NOLABEL || status == INTEGRITY_NOXATTRS) cause = "missing-HMAC"; - else if (status = INTEGRITY_FAIL) + else if (status == INTEGRITY_FAIL) cause = "invalid-HMAC"; @@ -293,10 +292,10 @@ int ima_appraise_measurement(enum ima_hooks func, xattr_value->type != EVM_IMA_XATTR_DIGSIG)) { if (!ima_fix_xattr(dentry, iint)) status = INTEGRITY_PASS; -- } else if ((inode->i_size = 0) && -+ } else if (inode->i_size = 0 && +- } else if ((inode->i_size == 0) && ++ } else if (inode->i_size == 0 && (iint->flags & IMA_NEW_FILE) && - (xattr_value && -- xattr_value->type = EVM_IMA_XATTR_DIGSIG)) { +- xattr_value->type == EVM_IMA_XATTR_DIGSIG)) { + xattr_value && -+ xattr_value->type = EVM_IMA_XATTR_DIGSIG) { ++ xattr_value->type == EVM_IMA_XATTR_DIGSIG) { status = INTEGRITY_PASS; } integrity_audit_msg(AUDIT_INTEGRITY_DATA, inode, filename, @@ -57,3 +57,8 @@ index 28af43f63572..8bebcbb61162 100644 goto out; rc = ima_write_template_field_data(xattr_value, xattr_len, fmt, + +-- +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/N3/content_digest index c4f6c36..879d551 100644 --- a/a/content_digest +++ b/N3/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 02/18] ima: Remove some superfluous parentheses\0" - "Date\0Wed, 18 Oct 2017 00:53:15 +0000\0" - "To\0linux-integrity@vger.kernel.org\0" - "Cc\0Jessica Yu <jeyu@redhat.com>" - linuxppc-dev@lists.ozlabs.org - Rusty Russell <rusty@rustcorp.com.au> - linux-kernel@vger.kernel.org - David S. Miller <davem@davemloft.net> - David Howells <dhowells@redhat.com> - AKASHI - Takahiro <takahiro.akashi@linaro.org> - linux-security-module@vger.kernel.org - keyrings@vger.kernel.org - linux-crypto@vger.kernel.org - James Morris <james.l.morris@oracle.com> - Dmitry Kasatkin <dmitry.kasatkin@gmail.com> - Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - Herbert Xu <herbert@gondor.apana.org.au> - Mimi Zohar <zohar@linux.vnet.ibm.com> - David Woodhouse <dwmw2@infradead.org> - " Serge E. Hallyn <serge@hallyn.com>\0" + "Date\0Tue, 17 Oct 2017 22:53:15 -0200\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "Superfluous parentheses just add clutter to the code, making it harder to\n" @@ -48,24 +30,24 @@ " \n" " \tstatus = evm_verifyxattr(dentry, XATTR_NAME_IMA, xattr_value, rc, iint);\n" "-\tif ((status != INTEGRITY_PASS) && (status != INTEGRITY_UNKNOWN)) {\n" - "-\t\tif ((status = INTEGRITY_NOLABEL)\n" - "-\t\t || (status = INTEGRITY_NOXATTRS))\n" + "-\t\tif ((status == INTEGRITY_NOLABEL)\n" + "-\t\t || (status == INTEGRITY_NOXATTRS))\n" "+\tif (status != INTEGRITY_PASS && status != INTEGRITY_UNKNOWN) {\n" - "+\t\tif (status = INTEGRITY_NOLABEL || status = INTEGRITY_NOXATTRS)\n" + "+\t\tif (status == INTEGRITY_NOLABEL || status == INTEGRITY_NOXATTRS)\n" " \t\t\tcause = \"missing-HMAC\";\n" - " \t\telse if (status = INTEGRITY_FAIL)\n" + " \t\telse if (status == INTEGRITY_FAIL)\n" " \t\t\tcause = \"invalid-HMAC\";\n" "@@ -293,10 +292,10 @@ int ima_appraise_measurement(enum ima_hooks func,\n" " \t\t xattr_value->type != EVM_IMA_XATTR_DIGSIG)) {\n" " \t\t\tif (!ima_fix_xattr(dentry, iint))\n" " \t\t\t\tstatus = INTEGRITY_PASS;\n" - "-\t\t} else if ((inode->i_size = 0) &&\n" - "+\t\t} else if (inode->i_size = 0 &&\n" + "-\t\t} else if ((inode->i_size == 0) &&\n" + "+\t\t} else if (inode->i_size == 0 &&\n" " \t\t\t (iint->flags & IMA_NEW_FILE) &&\n" "-\t\t\t (xattr_value &&\n" - "-\t\t\t xattr_value->type = EVM_IMA_XATTR_DIGSIG)) {\n" + "-\t\t\t xattr_value->type == EVM_IMA_XATTR_DIGSIG)) {\n" "+\t\t\t xattr_value &&\n" - "+\t\t\t xattr_value->type = EVM_IMA_XATTR_DIGSIG) {\n" + "+\t\t\t xattr_value->type == EVM_IMA_XATTR_DIGSIG) {\n" " \t\t\tstatus = INTEGRITY_PASS;\n" " \t\t}\n" " \t\tintegrity_audit_msg(AUDIT_INTEGRITY_DATA, inode, filename,\n" @@ -81,6 +63,11 @@ "+\tif (!xattr_value || xattr_value->type != EVM_IMA_XATTR_DIGSIG)\n" " \t\tgoto out;\n" " \n" - " \trc = ima_write_template_field_data(xattr_value, xattr_len, fmt," + " \trc = ima_write_template_field_data(xattr_value, xattr_len, fmt,\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 -97a2cac62a26150a8ecc10e9ffb0e6d67d7ebb5a921c4f7ac8034261bb01768b +ce2ea87e11afa54b3ac8c665f2e886dcb2c297547cc22bfe146bd6d77666c6d9
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.