diff for duplicates of <87h8xpyjn2.fsf@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index acd9f63..8c188fd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ Thiago Jung Bauermann IBM Linux Technology Center -From df2e29f29c99f5c986d8005d8af8409b3c4d115c Mon Sep 17 00:00:00 2001 +>From df2e29f29c99f5c986d8005d8af8409b3c4d115c Mon Sep 17 00:00:00 2001 From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> Date: Tue, 16 May 2017 17:14:49 -0300 Subject: [PATCH v4 1/7] integrity: Introduce struct evm_xattr @@ -93,7 +93,7 @@ index d7f282d75cc1..d902a18ef66f 100644 rc = evm_calc_hmac(dentry, xattr_name, xattr_value, xattr_value_len, xattr_data.digest); - if (rc = 0) { + if (rc == 0) { - xattr_data.type = EVM_XATTR_HMAC; + xattr_data.data.type = EVM_XATTR_HMAC; rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM, @@ -164,7 +164,7 @@ index 809ba70fbbbf..87d2b601cf8e 100644 break; @@ -164,7 +165,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 05df831..f570ab0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\01501245566.10288.35.camel@linux.vnet.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v3 1/7] integrity: Introduce struct evm_hmac_xattr\0" - "Date\0Wed, 02 Aug 2017 17:17:05 +0000\0" + "Date\0Wed, 02 Aug 2017 14:17:05 -0300\0" "To\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" "Cc\0linux-security-module@vger.kernel.org" linux-ima-devel@lists.sourceforge.net @@ -20,7 +20,7 @@ Rusty Russell <rusty@rustcorp.com.au> Herbert Xu <herbert@gondor.apana.org.au> David S. Miller <davem@davemloft.net> - AKASHI + " AKASHI\\" " Takahiro <takahiro.akashi@linaro.org>\0" "\00:1\0" "b\0" @@ -75,7 +75,7 @@ "IBM Linux Technology Center\n" "\n" "\n" - "From df2e29f29c99f5c986d8005d8af8409b3c4d115c Mon Sep 17 00:00:00 2001\n" + ">From df2e29f29c99f5c986d8005d8af8409b3c4d115c Mon Sep 17 00:00:00 2001\n" "From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\n" "Date: Tue, 16 May 2017 17:14:49 -0300\n" "Subject: [PATCH v4 1/7] integrity: Introduce struct evm_xattr\n" @@ -119,7 +119,7 @@ " \n" " \trc = evm_calc_hmac(dentry, xattr_name, xattr_value,\n" " \t\t\t xattr_value_len, xattr_data.digest);\n" - " \tif (rc = 0) {\n" + " \tif (rc == 0) {\n" "-\t\txattr_data.type = EVM_XATTR_HMAC;\n" "+\t\txattr_data.data.type = EVM_XATTR_HMAC;\n" " \t\trc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM,\n" @@ -190,7 +190,7 @@ " \t\tbreak;\n" "@@ -164,7 +165,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" @@ -225,4 +225,4 @@ "-- \n" 2.13.0 -23152ebf1b109547755ce31eb1c2438b1ce258cd90cc32667d85300d37a486b5 +109596fe987007cf1205c96454d143933257bdcccefd798acde520e0bf21accc
diff --git a/a/1.txt b/N2/1.txt index acd9f63..9fbd00d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -49,7 +49,7 @@ Thiago Jung Bauermann IBM Linux Technology Center -From df2e29f29c99f5c986d8005d8af8409b3c4d115c Mon Sep 17 00:00:00 2001 +>From df2e29f29c99f5c986d8005d8af8409b3c4d115c Mon Sep 17 00:00:00 2001 From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> Date: Tue, 16 May 2017 17:14:49 -0300 Subject: [PATCH v4 1/7] integrity: Introduce struct evm_xattr @@ -93,7 +93,7 @@ index d7f282d75cc1..d902a18ef66f 100644 rc = evm_calc_hmac(dentry, xattr_name, xattr_value, xattr_value_len, xattr_data.digest); - if (rc = 0) { + if (rc == 0) { - xattr_data.type = EVM_XATTR_HMAC; + xattr_data.data.type = EVM_XATTR_HMAC; rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM, @@ -164,7 +164,7 @@ index 809ba70fbbbf..87d2b601cf8e 100644 break; @@ -164,7 +165,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)) @@ -198,3 +198,8 @@ index a53e7e4ab06c..9b1762076f38 100644 -- 2.13.0 + +-- +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 05df831..a046aab 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,10 @@ "ref\020170706221753.17380-1-bauerman@linux.vnet.ibm.com\0" "ref\020170706221753.17380-2-bauerman@linux.vnet.ibm.com\0" "ref\01501245566.10288.35.camel@linux.vnet.ibm.com\0" - "From\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\0" - "Subject\0Re: [PATCH v3 1/7] integrity: Introduce struct evm_hmac_xattr\0" - "Date\0Wed, 02 Aug 2017 17:17:05 +0000\0" - "To\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" - "Cc\0linux-security-module@vger.kernel.org" - linux-ima-devel@lists.sourceforge.net - 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 <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>\0" + "From\0bauerman@linux.vnet.ibm.com (Thiago Jung Bauermann)\0" + "Subject\0[PATCH v3 1/7] integrity: Introduce struct evm_hmac_xattr\0" + "Date\0Wed, 02 Aug 2017 14:17:05 -0300\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -75,7 +58,7 @@ "IBM Linux Technology Center\n" "\n" "\n" - "From df2e29f29c99f5c986d8005d8af8409b3c4d115c Mon Sep 17 00:00:00 2001\n" + ">From df2e29f29c99f5c986d8005d8af8409b3c4d115c Mon Sep 17 00:00:00 2001\n" "From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>\n" "Date: Tue, 16 May 2017 17:14:49 -0300\n" "Subject: [PATCH v4 1/7] integrity: Introduce struct evm_xattr\n" @@ -119,7 +102,7 @@ " \n" " \trc = evm_calc_hmac(dentry, xattr_name, xattr_value,\n" " \t\t\t xattr_value_len, xattr_data.digest);\n" - " \tif (rc = 0) {\n" + " \tif (rc == 0) {\n" "-\t\txattr_data.type = EVM_XATTR_HMAC;\n" "+\t\txattr_data.data.type = EVM_XATTR_HMAC;\n" " \t\trc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM,\n" @@ -190,7 +173,7 @@ " \t\tbreak;\n" "@@ -164,7 +165,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" @@ -223,6 +206,11 @@ " } __packed;\n" " \n" "-- \n" - 2.13.0 + "2.13.0\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 -23152ebf1b109547755ce31eb1c2438b1ce258cd90cc32667d85300d37a486b5 +462486e3c8e653e3364fb7cf6be56b17856aa7845e5591451b58f5d79454c0f7
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.