diff for duplicates of <20181116200712.14154-9-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 853889a..a1b62d3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ index cc12f3449a72..e4f72b30cb28 100644 +static inline bool is_signed(const struct evm_ima_xattr_data *xattr_value) +{ -+ return xattr_value && xattr_value->type = EVM_IMA_XATTR_DIGSIG; ++ return xattr_value && xattr_value->type == EVM_IMA_XATTR_DIGSIG; +} + /* @@ -43,8 +43,8 @@ index 8bcef90939f8..c6459408e6b2 100644 } /* Permit new files with file signatures, but without data. */ - if (inode->i_size = 0 && iint->flags & IMA_NEW_FILE && -- xattr_value && xattr_value->type = EVM_IMA_XATTR_DIGSIG) { + if (inode->i_size == 0 && iint->flags & IMA_NEW_FILE && +- xattr_value && xattr_value->type == EVM_IMA_XATTR_DIGSIG) { + is_signed(xattr_value)) { status = INTEGRITY_PASS; } @@ -53,7 +53,7 @@ index 8bcef90939f8..c6459408e6b2 100644 if (!xattr_value_len || (xvalue->type >= IMA_XATTR_LAST)) return -EINVAL; ima_reset_appraise_flags(d_backing_inode(dentry), -- xvalue->type = EVM_IMA_XATTR_DIGSIG); +- xvalue->type == EVM_IMA_XATTR_DIGSIG); + is_signed(xvalue)); result = 0; } diff --git a/a/content_digest b/N1/content_digest index bf7b4ca..e8034ae 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 08/14] ima: Introduce is_signed()\0" - "Date\0Fri, 16 Nov 2018 20:07:06 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:06 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -47,7 +47,7 @@ " \n" "+static inline bool is_signed(const struct evm_ima_xattr_data *xattr_value)\n" "+{\n" - "+\treturn xattr_value && xattr_value->type = EVM_IMA_XATTR_DIGSIG;\n" + "+\treturn xattr_value && xattr_value->type == EVM_IMA_XATTR_DIGSIG;\n" "+}\n" "+\n" " /*\n" @@ -69,8 +69,8 @@ " \t\t}\n" " \n" " \t\t/* Permit new files with file signatures, but without data. */\n" - " \t\tif (inode->i_size = 0 && iint->flags & IMA_NEW_FILE &&\n" - "-\t\t xattr_value && xattr_value->type = EVM_IMA_XATTR_DIGSIG) {\n" + " \t\tif (inode->i_size == 0 && iint->flags & IMA_NEW_FILE &&\n" + "-\t\t xattr_value && xattr_value->type == EVM_IMA_XATTR_DIGSIG) {\n" "+\t\t is_signed(xattr_value)) {\n" " \t\t\tstatus = INTEGRITY_PASS;\n" " \t\t}\n" @@ -79,7 +79,7 @@ " \t\tif (!xattr_value_len || (xvalue->type >= IMA_XATTR_LAST))\n" " \t\t\treturn -EINVAL;\n" " \t\tima_reset_appraise_flags(d_backing_inode(dentry),\n" - "-\t\t\txvalue->type = EVM_IMA_XATTR_DIGSIG);\n" + "-\t\t\txvalue->type == EVM_IMA_XATTR_DIGSIG);\n" "+\t\t\t\t\t is_signed(xvalue));\n" " \t\tresult = 0;\n" " \t}\n" @@ -98,4 +98,4 @@ " \n" " \treturn ima_write_template_field_data(xattr_value, event_data->xattr_len," -bc33b91be82567a6b81451ca48df56a30a2b7b6230b53dbc6a193d2c3f856ccd +e835654b4fc7d64c09107f8d24360bb6ac708a4fd35442970dfc587ac877d5ae
diff --git a/a/1.txt b/N2/1.txt index 853889a..a1b62d3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,7 +21,7 @@ index cc12f3449a72..e4f72b30cb28 100644 +static inline bool is_signed(const struct evm_ima_xattr_data *xattr_value) +{ -+ return xattr_value && xattr_value->type = EVM_IMA_XATTR_DIGSIG; ++ return xattr_value && xattr_value->type == EVM_IMA_XATTR_DIGSIG; +} + /* @@ -43,8 +43,8 @@ index 8bcef90939f8..c6459408e6b2 100644 } /* Permit new files with file signatures, but without data. */ - if (inode->i_size = 0 && iint->flags & IMA_NEW_FILE && -- xattr_value && xattr_value->type = EVM_IMA_XATTR_DIGSIG) { + if (inode->i_size == 0 && iint->flags & IMA_NEW_FILE && +- xattr_value && xattr_value->type == EVM_IMA_XATTR_DIGSIG) { + is_signed(xattr_value)) { status = INTEGRITY_PASS; } @@ -53,7 +53,7 @@ index 8bcef90939f8..c6459408e6b2 100644 if (!xattr_value_len || (xvalue->type >= IMA_XATTR_LAST)) return -EINVAL; ima_reset_appraise_flags(d_backing_inode(dentry), -- xvalue->type = EVM_IMA_XATTR_DIGSIG); +- xvalue->type == EVM_IMA_XATTR_DIGSIG); + is_signed(xvalue)); result = 0; } diff --git a/a/content_digest b/N2/content_digest index bf7b4ca..8041c70 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 08/14] ima: Introduce is_signed()\0" - "Date\0Fri, 16 Nov 2018 20:07:06 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:06 -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" "With the introduction of another IMA signature type (modsig), some places\n" @@ -47,7 +47,7 @@ " \n" "+static inline bool is_signed(const struct evm_ima_xattr_data *xattr_value)\n" "+{\n" - "+\treturn xattr_value && xattr_value->type = EVM_IMA_XATTR_DIGSIG;\n" + "+\treturn xattr_value && xattr_value->type == EVM_IMA_XATTR_DIGSIG;\n" "+}\n" "+\n" " /*\n" @@ -69,8 +69,8 @@ " \t\t}\n" " \n" " \t\t/* Permit new files with file signatures, but without data. */\n" - " \t\tif (inode->i_size = 0 && iint->flags & IMA_NEW_FILE &&\n" - "-\t\t xattr_value && xattr_value->type = EVM_IMA_XATTR_DIGSIG) {\n" + " \t\tif (inode->i_size == 0 && iint->flags & IMA_NEW_FILE &&\n" + "-\t\t xattr_value && xattr_value->type == EVM_IMA_XATTR_DIGSIG) {\n" "+\t\t is_signed(xattr_value)) {\n" " \t\t\tstatus = INTEGRITY_PASS;\n" " \t\t}\n" @@ -79,7 +79,7 @@ " \t\tif (!xattr_value_len || (xvalue->type >= IMA_XATTR_LAST))\n" " \t\t\treturn -EINVAL;\n" " \t\tima_reset_appraise_flags(d_backing_inode(dentry),\n" - "-\t\t\txvalue->type = EVM_IMA_XATTR_DIGSIG);\n" + "-\t\t\txvalue->type == EVM_IMA_XATTR_DIGSIG);\n" "+\t\t\t\t\t is_signed(xvalue));\n" " \t\tresult = 0;\n" " \t}\n" @@ -98,4 +98,4 @@ " \n" " \treturn ima_write_template_field_data(xattr_value, event_data->xattr_len," -bc33b91be82567a6b81451ca48df56a30a2b7b6230b53dbc6a193d2c3f856ccd +e38624aa735e0b4cd6295a92f6e5e62615b4dc4c67b9b41ab06e48d43c0a14e9
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.