diff for duplicates of <1522074273.3541.83.camel@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 0d770a6..78641ed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,7 +32,7 @@ Mimi > > +static inline bool is_ima_sig(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; > +} > + > /* @@ -54,8 +54,8 @@ Mimi > } > > /* 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_ima_sig(xattr_value)) { > status = INTEGRITY_PASS; > } @@ -64,7 +64,7 @@ Mimi > 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_ima_sig(xvalue)); > result = 0; > } diff --git a/a/content_digest b/N1/content_digest index 43f50a7..8d49119 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020180316203837.10174-5-bauerman@linux.vnet.ibm.com\0" "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v6 04/12] ima: Introduce is_ima_sig()\0" - "Date\0Mon, 26 Mar 2018 14:24:33 +0000\0" + "Date\0Mon, 26 Mar 2018 10:24:33 -0400\0" "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" " linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" @@ -56,7 +56,7 @@ "> \n" "> +static inline bool is_ima_sig(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" @@ -78,8 +78,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_ima_sig(xattr_value)) {\n" "> \t\t\tstatus = INTEGRITY_PASS;\n" "> \t\t}\n" @@ -88,7 +88,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_ima_sig(xvalue));\n" "> \t\tresult = 0;\n" "> \t}\n" @@ -108,4 +108,4 @@ "> \treturn ima_write_template_field_data(xattr_value, event_data->xattr_len,\n" > -90bdf1cfab45684dfd7ea45db467176bee880af3e4ed68d70b8fc188de20f3f6 +e1162d744341a07b5afac7b023107234ae7b3f6388975a648c2b85c4a4c3d272
diff --git a/a/1.txt b/N2/1.txt index 0d770a6..9292103 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,9 +5,9 @@ On Fri, 2018-03-16 at 17:38 -0300, Thiago Jung Bauermann wrote: > signature. Initially the function name "is_ima_sig" is fine, since it reflects -the 'imasig' type. Having a more generic function name would be -better when adding 'modsig' support. As long as the function is -locally define, we can drop 'ima' from the name. Perhaps something +the 'imasig' type. Having a more generic function name would be +better when adding 'modsig' support. As long as the function is +locally define, we can drop 'ima' from the name. Perhaps something like has_signature or is_signed() would be preferable. Mimi @@ -32,7 +32,7 @@ Mimi > > +static inline bool is_ima_sig(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; > +} > + > /* @@ -54,8 +54,8 @@ Mimi > } > > /* 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_ima_sig(xattr_value)) { > status = INTEGRITY_PASS; > } @@ -64,7 +64,7 @@ Mimi > 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_ima_sig(xvalue)); > result = 0; > } diff --git a/a/content_digest b/N2/content_digest index 43f50a7..5f08e21 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020180316203837.10174-5-bauerman@linux.vnet.ibm.com\0" "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v6 04/12] ima: Introduce is_ima_sig()\0" - "Date\0Mon, 26 Mar 2018 14:24:33 +0000\0" + "Date\0Mon, 26 Mar 2018 10:24:33 -0400\0" "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" " linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" @@ -29,9 +29,9 @@ "> signature.\n" "\n" "Initially the function name \"is_ima_sig\" is fine, since it reflects\n" - "the 'imasig' type. \302\240Having a more generic function name would be\n" - "better when adding 'modsig' support. \302\240As long as the function is\n" - "locally define, we can drop 'ima' from the name. \302\240Perhaps something\n" + "the 'imasig' type. Having a more generic function name would be\n" + "better when adding 'modsig' support. As long as the function is\n" + "locally define, we can drop 'ima' from the name. Perhaps something\n" "like has_signature or is_signed() would be preferable.\n" "\n" "Mimi\n" @@ -56,7 +56,7 @@ "> \n" "> +static inline bool is_ima_sig(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" @@ -78,8 +78,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_ima_sig(xattr_value)) {\n" "> \t\t\tstatus = INTEGRITY_PASS;\n" "> \t\t}\n" @@ -88,7 +88,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_ima_sig(xvalue));\n" "> \t\tresult = 0;\n" "> \t}\n" @@ -108,4 +108,4 @@ "> \treturn ima_write_template_field_data(xattr_value, event_data->xattr_len,\n" > -90bdf1cfab45684dfd7ea45db467176bee880af3e4ed68d70b8fc188de20f3f6 +b5685dbfaa610f92ea8765fe22dbb2ccac64a9e6fea9b76d5e1145068e7d9cbf
diff --git a/a/1.txt b/N3/1.txt index 0d770a6..528438e 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -5,9 +5,9 @@ On Fri, 2018-03-16 at 17:38 -0300, Thiago Jung Bauermann wrote: > signature. Initially the function name "is_ima_sig" is fine, since it reflects -the 'imasig' type. Having a more generic function name would be -better when adding 'modsig' support. As long as the function is -locally define, we can drop 'ima' from the name. Perhaps something +the 'imasig' type. ?Having a more generic function name would be +better when adding 'modsig' support. ?As long as the function is +locally define, we can drop 'ima' from the name. ?Perhaps something like has_signature or is_signed() would be preferable. Mimi @@ -32,7 +32,7 @@ Mimi > > +static inline bool is_ima_sig(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; > +} > + > /* @@ -54,8 +54,8 @@ Mimi > } > > /* 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_ima_sig(xattr_value)) { > status = INTEGRITY_PASS; > } @@ -64,7 +64,7 @@ Mimi > 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_ima_sig(xvalue)); > result = 0; > } @@ -82,4 +82,9 @@ Mimi > return 0; > > return ima_write_template_field_data(xattr_value, event_data->xattr_len, -> +> + +-- +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 43f50a7..724a680 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,25 +1,9 @@ "ref\020180316203837.10174-1-bauerman@linux.vnet.ibm.com\0" "ref\020180316203837.10174-5-bauerman@linux.vnet.ibm.com\0" - "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" - "Subject\0Re: [PATCH v6 04/12] ima: Introduce is_ima_sig()\0" - "Date\0Mon, 26 Mar 2018 14:24:33 +0000\0" - "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" - " linux-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 - 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> - AKASHI - " Takahiro <takahiro.akashi@linaro.org>\0" + "From\0zohar@linux.vnet.ibm.com (Mimi Zohar)\0" + "Subject\0[PATCH v6 04/12] ima: Introduce is_ima_sig()\0" + "Date\0Mon, 26 Mar 2018 10:24:33 -0400\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 2018-03-16 at 17:38 -0300, Thiago Jung Bauermann wrote:\n" @@ -29,9 +13,9 @@ "> signature.\n" "\n" "Initially the function name \"is_ima_sig\" is fine, since it reflects\n" - "the 'imasig' type. \302\240Having a more generic function name would be\n" - "better when adding 'modsig' support. \302\240As long as the function is\n" - "locally define, we can drop 'ima' from the name. \302\240Perhaps something\n" + "the 'imasig' type. ?Having a more generic function name would be\n" + "better when adding 'modsig' support. ?As long as the function is\n" + "locally define, we can drop 'ima' from the name. ?Perhaps something\n" "like has_signature or is_signed() would be preferable.\n" "\n" "Mimi\n" @@ -56,7 +40,7 @@ "> \n" "> +static inline bool is_ima_sig(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" @@ -78,8 +62,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_ima_sig(xattr_value)) {\n" "> \t\t\tstatus = INTEGRITY_PASS;\n" "> \t\t}\n" @@ -88,7 +72,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_ima_sig(xvalue));\n" "> \t\tresult = 0;\n" "> \t}\n" @@ -106,6 +90,11 @@ "> \t\treturn 0;\n" "> \n" "> \treturn ima_write_template_field_data(xattr_value, event_data->xattr_len,\n" - > + "> \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 -90bdf1cfab45684dfd7ea45db467176bee880af3e4ed68d70b8fc188de20f3f6 +50231371e5257d75e6b16e708e10795958c0255c39656787b410605e133bdeaf
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.