diff for duplicates of <1543525152.3902.411.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index b6c7194..3d7ff34 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -88,7 +88,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.ibm.com> > break; > @@ -175,7 +176,7 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value, > /* this is for backward compatibility */ -> if (xattr_len = 21) { +> if (xattr_len == 21) { > unsigned int zero = 0; > - if (!memcmp(&xattr_value->digest[16], &zero, 4)) > + if (!memcmp(&xattr_value->data[16], &zero, 4)) diff --git a/a/content_digest b/N1/content_digest index 116e2e8..b7e47d4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020181116200712.14154-5-bauerman@linux.ibm.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v8 04/14] integrity: Introduce struct evm_xattr\0" - "Date\0Thu, 29 Nov 2018 20:59:12 +0000\0" + "Date\0Thu, 29 Nov 2018 15:59:12 -0500\0" "To\0Thiago Jung Bauermann <bauerman@linux.ibm.com>" " linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" @@ -114,7 +114,7 @@ "> \t\tbreak;\n" "> @@ -175,7 +176,7 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value,\n" "> \t\t/* this is for backward compatibility */\n" - "> \t\tif (xattr_len = 21) {\n" + "> \t\tif (xattr_len == 21) {\n" "> \t\t\tunsigned int zero = 0;\n" "> -\t\t\tif (!memcmp(&xattr_value->digest[16], &zero, 4))\n" "> +\t\t\tif (!memcmp(&xattr_value->data[16], &zero, 4))\n" @@ -150,4 +150,4 @@ "> } __packed;\n" > -cbd4c5b89a1adca60ec0a0bd2365df16a2515ebde06e3a8f8a32c5cadff6a2b9 +1129aaed5f4fefd65d4294ee48c02b8e7ac6f4a9efeeec3902239ef116ad24e4
diff --git a/a/1.txt b/N2/1.txt index b6c7194..3d7ff34 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -88,7 +88,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.ibm.com> > break; > @@ -175,7 +176,7 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value, > /* this is for backward compatibility */ -> if (xattr_len = 21) { +> if (xattr_len == 21) { > unsigned int zero = 0; > - if (!memcmp(&xattr_value->digest[16], &zero, 4)) > + if (!memcmp(&xattr_value->data[16], &zero, 4)) diff --git a/a/content_digest b/N2/content_digest index 116e2e8..9a7bfa8 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,26 +2,26 @@ "ref\020181116200712.14154-5-bauerman@linux.ibm.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v8 04/14] integrity: Introduce struct evm_xattr\0" - "Date\0Thu, 29 Nov 2018 20:59:12 +0000\0" + "Date\0Thu, 29 Nov 2018 15:59:12 -0500\0" "To\0Thiago Jung Bauermann <bauerman@linux.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 + "Cc\0Herbert Xu <herbert@gondor.apana.org.au>" linux-doc@vger.kernel.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> Jonathan Corbet <corbet@lwn.net> + linux-kernel@vger.kernel.org + James Morris <jmorris@namei.org> + David Howells <dhowells@redhat.com> AKASHI - " Takahiro <takahiro.akashi@linaro.org>\0" + Takahiro <takahiro.akashi@linaro.org> + 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> + " Serge E. Hallyn <serge@hallyn.com>\0" "\00:1\0" "b\0" "On Fri, 2018-11-16 at 18:07 -0200, Thiago Jung Bauermann wrote:\n" @@ -114,7 +114,7 @@ "> \t\tbreak;\n" "> @@ -175,7 +176,7 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value,\n" "> \t\t/* this is for backward compatibility */\n" - "> \t\tif (xattr_len = 21) {\n" + "> \t\tif (xattr_len == 21) {\n" "> \t\t\tunsigned int zero = 0;\n" "> -\t\t\tif (!memcmp(&xattr_value->digest[16], &zero, 4))\n" "> +\t\t\tif (!memcmp(&xattr_value->data[16], &zero, 4))\n" @@ -150,4 +150,4 @@ "> } __packed;\n" > -cbd4c5b89a1adca60ec0a0bd2365df16a2515ebde06e3a8f8a32c5cadff6a2b9 +32a73cd6c4f725d213b93608cbe1abf78950511cd326799b88abc409acaff26a
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.