diff for duplicates of <20180118131359.8365-1-git@andred.net> diff --git a/a/1.txt b/N1/1.txt index be398bb..a19f854 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,7 +60,7 @@ thereby also protecting fscrypt.blob): keyctl add trusted kmk "load $(cat /keys/kmk.blob)" @u keyctl add encrypted fscrypt:1234567890123456 "load $(cat /keys/fscrypt.blob)" @u -Signed-off-by: AndrĂ© Draszik <git@andred.net> +Signed-off-by: André Draszik <git@andred.net> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: David Howells <dhowells@redhat.com> Cc: James Morris <james.l.morris@oracle.com> @@ -175,7 +175,7 @@ index 776ddc655f79..852ac2900b66 100644 + $ keyctl add encrypted fscrypt:1234567890123456 "load $(cat fscrypt.blob)" @u + Access semantics - ======== + ================ diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 5e6e846f5a24..3d20addadcd4 100644 @@ -252,7 +252,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 return -ENOMEM; keyring_key = request_key(&key_type_logon, description, NULL); -+ if (keyring_key = ERR_PTR(-ENOKEY)) ++ if (keyring_key == ERR_PTR(-ENOKEY)) + keyring_key = fscrypt_get_encrypted_key(description); kfree(description); if (IS_ERR(keyring_key)) @@ -260,7 +260,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 down_read(&keyring_key->sem); - if (keyring_key->type != &key_type_logon) { -+ if (keyring_key->type = &key_type_logon) { ++ if (keyring_key->type == &key_type_logon) { + const struct user_key_payload *ukp; + const struct fscrypt_key *fk; + @@ -277,7 +277,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 + fk = (struct fscrypt_key *)ukp->data; + master_key = fk->raw; + master_key_len = fk->size; -+ } else if (keyring_key->type = &key_type_encrypted) { ++ } else if (keyring_key->type == &key_type_encrypted) { + const struct encrypted_key_payload *ekp; + + ekp = keyring_key->payload.data[0]; @@ -338,12 +338,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 + inode->i_sb->s_cop->key_prefix, + keysize); if (res2) { - if (res2 = -ENOKEY) + if (res2 == -ENOKEY) res = -ENOKEY; -- 2.15.1 - --- -To unsubscribe from this list: send the line "unsubscribe keyrings" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 68c3ae0..a969e01 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -79,7 +79,7 @@ " keyctl add trusted kmk \"load $(cat /keys/kmk.blob)\" @u\n" " keyctl add encrypted fscrypt:1234567890123456 \"load $(cat /keys/fscrypt.blob)\" @u\n" "\n" - "Signed-off-by: Andr\304\202\302\251 Draszik <git@andred.net>\n" + "Signed-off-by: Andr\303\251 Draszik <git@andred.net>\n" "Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>\n" "Cc: David Howells <dhowells@redhat.com>\n" "Cc: James Morris <james.l.morris@oracle.com>\n" @@ -194,7 +194,7 @@ "+ $ keyctl add encrypted fscrypt:1234567890123456 \"load $(cat fscrypt.blob)\" @u\n" "+\n" " Access semantics\n" - " ========\n" + " ================\n" " \n" "diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c\n" "index 5e6e846f5a24..3d20addadcd4 100644\n" @@ -271,7 +271,7 @@ " \t\treturn -ENOMEM;\n" " \n" " \tkeyring_key = request_key(&key_type_logon, description, NULL);\n" - "+\tif (keyring_key = ERR_PTR(-ENOKEY))\n" + "+\tif (keyring_key == ERR_PTR(-ENOKEY))\n" "+\t\tkeyring_key = fscrypt_get_encrypted_key(description);\n" " \tkfree(description);\n" " \tif (IS_ERR(keyring_key))\n" @@ -279,7 +279,7 @@ " \tdown_read(&keyring_key->sem);\n" " \n" "-\tif (keyring_key->type != &key_type_logon) {\n" - "+\tif (keyring_key->type = &key_type_logon) {\n" + "+\tif (keyring_key->type == &key_type_logon) {\n" "+\t\tconst struct user_key_payload *ukp;\n" "+\t\tconst struct fscrypt_key *fk;\n" "+\n" @@ -296,7 +296,7 @@ "+\t\tfk = (struct fscrypt_key *)ukp->data;\n" "+\t\tmaster_key = fk->raw;\n" "+\t\tmaster_key_len = fk->size;\n" - "+\t} else if (keyring_key->type = &key_type_encrypted) {\n" + "+\t} else if (keyring_key->type == &key_type_encrypted) {\n" "+\t\tconst struct encrypted_key_payload *ekp;\n" "+\n" "+\t\tekp = keyring_key->payload.data[0];\n" @@ -357,14 +357,9 @@ "+\t\t\t\t\t\tinode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tkeysize);\n" " \t\tif (res2) {\n" - " \t\t\tif (res2 = -ENOKEY)\n" + " \t\t\tif (res2 == -ENOKEY)\n" " \t\t\t\tres = -ENOKEY;\n" "-- \n" - "2.15.1\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe keyrings\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + 2.15.1 -3c7aab24202a22d20f4e99e698efe1b33c5c091885aa19b7351d49694ab58503 +256f91d2d71ed5706b7780acd69b4f08de33779958191043de579ada14e2fe90
diff --git a/a/1.txt b/N2/1.txt index be398bb..66c15ef 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -60,7 +60,7 @@ thereby also protecting fscrypt.blob): keyctl add trusted kmk "load $(cat /keys/kmk.blob)" @u keyctl add encrypted fscrypt:1234567890123456 "load $(cat /keys/fscrypt.blob)" @u -Signed-off-by: André Draszik <git@andred.net> +Signed-off-by: Andre Draszik <git@andred.net> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: David Howells <dhowells@redhat.com> Cc: James Morris <james.l.morris@oracle.com> @@ -175,7 +175,7 @@ index 776ddc655f79..852ac2900b66 100644 + $ keyctl add encrypted fscrypt:1234567890123456 "load $(cat fscrypt.blob)" @u + Access semantics - ======== + ================ diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 5e6e846f5a24..3d20addadcd4 100644 @@ -252,7 +252,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 return -ENOMEM; keyring_key = request_key(&key_type_logon, description, NULL); -+ if (keyring_key = ERR_PTR(-ENOKEY)) ++ if (keyring_key == ERR_PTR(-ENOKEY)) + keyring_key = fscrypt_get_encrypted_key(description); kfree(description); if (IS_ERR(keyring_key)) @@ -260,7 +260,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 down_read(&keyring_key->sem); - if (keyring_key->type != &key_type_logon) { -+ if (keyring_key->type = &key_type_logon) { ++ if (keyring_key->type == &key_type_logon) { + const struct user_key_payload *ukp; + const struct fscrypt_key *fk; + @@ -277,7 +277,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 + fk = (struct fscrypt_key *)ukp->data; + master_key = fk->raw; + master_key_len = fk->size; -+ } else if (keyring_key->type = &key_type_encrypted) { ++ } else if (keyring_key->type == &key_type_encrypted) { + const struct encrypted_key_payload *ekp; + + ekp = keyring_key->payload.data[0]; @@ -338,12 +338,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 + inode->i_sb->s_cop->key_prefix, + keysize); if (res2) { - if (res2 = -ENOKEY) + if (res2 == -ENOKEY) res = -ENOKEY; -- 2.15.1 - --- -To unsubscribe from this list: send the line "unsubscribe keyrings" in -the body of a message to majordomo@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 68c3ae0..ce614f9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -79,7 +79,7 @@ " keyctl add trusted kmk \"load $(cat /keys/kmk.blob)\" @u\n" " keyctl add encrypted fscrypt:1234567890123456 \"load $(cat /keys/fscrypt.blob)\" @u\n" "\n" - "Signed-off-by: Andr\304\202\302\251 Draszik <git@andred.net>\n" + "Signed-off-by: Andre Draszik <git@andred.net>\n" "Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>\n" "Cc: David Howells <dhowells@redhat.com>\n" "Cc: James Morris <james.l.morris@oracle.com>\n" @@ -194,7 +194,7 @@ "+ $ keyctl add encrypted fscrypt:1234567890123456 \"load $(cat fscrypt.blob)\" @u\n" "+\n" " Access semantics\n" - " ========\n" + " ================\n" " \n" "diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c\n" "index 5e6e846f5a24..3d20addadcd4 100644\n" @@ -271,7 +271,7 @@ " \t\treturn -ENOMEM;\n" " \n" " \tkeyring_key = request_key(&key_type_logon, description, NULL);\n" - "+\tif (keyring_key = ERR_PTR(-ENOKEY))\n" + "+\tif (keyring_key == ERR_PTR(-ENOKEY))\n" "+\t\tkeyring_key = fscrypt_get_encrypted_key(description);\n" " \tkfree(description);\n" " \tif (IS_ERR(keyring_key))\n" @@ -279,7 +279,7 @@ " \tdown_read(&keyring_key->sem);\n" " \n" "-\tif (keyring_key->type != &key_type_logon) {\n" - "+\tif (keyring_key->type = &key_type_logon) {\n" + "+\tif (keyring_key->type == &key_type_logon) {\n" "+\t\tconst struct user_key_payload *ukp;\n" "+\t\tconst struct fscrypt_key *fk;\n" "+\n" @@ -296,7 +296,7 @@ "+\t\tfk = (struct fscrypt_key *)ukp->data;\n" "+\t\tmaster_key = fk->raw;\n" "+\t\tmaster_key_len = fk->size;\n" - "+\t} else if (keyring_key->type = &key_type_encrypted) {\n" + "+\t} else if (keyring_key->type == &key_type_encrypted) {\n" "+\t\tconst struct encrypted_key_payload *ekp;\n" "+\n" "+\t\tekp = keyring_key->payload.data[0];\n" @@ -357,14 +357,9 @@ "+\t\t\t\t\t\tinode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tkeysize);\n" " \t\tif (res2) {\n" - " \t\t\tif (res2 = -ENOKEY)\n" + " \t\t\tif (res2 == -ENOKEY)\n" " \t\t\t\tres = -ENOKEY;\n" "-- \n" - "2.15.1\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe keyrings\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + 2.15.1 -3c7aab24202a22d20f4e99e698efe1b33c5c091885aa19b7351d49694ab58503 +c746b78eb0b252d0626bdc6369bb5595145aff5e987095437793dfdfe9bbab10
diff --git a/a/1.txt b/N3/1.txt index be398bb..bb152b2 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -60,7 +60,7 @@ thereby also protecting fscrypt.blob): keyctl add trusted kmk "load $(cat /keys/kmk.blob)" @u keyctl add encrypted fscrypt:1234567890123456 "load $(cat /keys/fscrypt.blob)" @u -Signed-off-by: André Draszik <git@andred.net> +Signed-off-by: Andr? Draszik <git@andred.net> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: David Howells <dhowells@redhat.com> Cc: James Morris <james.l.morris@oracle.com> @@ -69,11 +69,11 @@ Cc: "Theodore Y. Ts'o" <tytso@mit.edu> Cc: Jaegeuk Kim <jaegeuk@kernel.org> Cc: Kees Cook <keescook@chromium.org> Cc: Eric Biggers <ebiggers@google.com> -Cc: linux-integrity@vger.kernel.org -Cc: keyrings@vger.kernel.org -Cc: linux-security-module@vger.kernel.org -Cc: linux-fscrypt@vger.kernel.org -Cc: linux-kernel@vger.kernel.org +Cc: linux-integrity at vger.kernel.org +Cc: keyrings at vger.kernel.org +Cc: linux-security-module at vger.kernel.org +Cc: linux-fscrypt at vger.kernel.org +Cc: linux-kernel at vger.kernel.org --- changes in v3: @@ -175,7 +175,7 @@ index 776ddc655f79..852ac2900b66 100644 + $ keyctl add encrypted fscrypt:1234567890123456 "load $(cat fscrypt.blob)" @u + Access semantics - ======== + ================ diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 5e6e846f5a24..3d20addadcd4 100644 @@ -252,7 +252,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 return -ENOMEM; keyring_key = request_key(&key_type_logon, description, NULL); -+ if (keyring_key = ERR_PTR(-ENOKEY)) ++ if (keyring_key == ERR_PTR(-ENOKEY)) + keyring_key = fscrypt_get_encrypted_key(description); kfree(description); if (IS_ERR(keyring_key)) @@ -260,7 +260,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 down_read(&keyring_key->sem); - if (keyring_key->type != &key_type_logon) { -+ if (keyring_key->type = &key_type_logon) { ++ if (keyring_key->type == &key_type_logon) { + const struct user_key_payload *ukp; + const struct fscrypt_key *fk; + @@ -277,7 +277,7 @@ index 5e6e846f5a24..3d20addadcd4 100644 + fk = (struct fscrypt_key *)ukp->data; + master_key = fk->raw; + master_key_len = fk->size; -+ } else if (keyring_key->type = &key_type_encrypted) { ++ } else if (keyring_key->type == &key_type_encrypted) { + const struct encrypted_key_payload *ekp; + + ekp = keyring_key->payload.data[0]; @@ -338,12 +338,12 @@ index 5e6e846f5a24..3d20addadcd4 100644 + inode->i_sb->s_cop->key_prefix, + keysize); if (res2) { - if (res2 = -ENOKEY) + if (res2 == -ENOKEY) res = -ENOKEY; -- 2.15.1 -- -To unsubscribe from this list: send the line "unsubscribe keyrings" in -the body of a message to majordomo@vger.kernel.org +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 68c3ae0..c31f60c 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,20 +1,7 @@ - "From\0Andr\303\251 Draszik <git@andred.net>\0" + "From\0git@andred.net (Andr\303\251 Draszik)\0" "Subject\0[PATCH v3] fscrypt: add support for the encrypted key type\0" "Date\0Thu, 18 Jan 2018 13:13:59 +0000\0" - "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Andr\303\251 Draszik <git@andred.net>" - Mimi Zohar <zohar@linux.vnet.ibm.com> - David Howells <dhowells@redhat.com> - James Morris <james.l.morris@oracle.com> - Serge E. Hallyn <serge@hallyn.com> - Theodore Y. Ts'o <tytso@mit.edu> - Jaegeuk Kim <jaegeuk@kernel.org> - Kees Cook <keescook@chromium.org> - Eric Biggers <ebiggers@google.com> - linux-integrity@vger.kernel.org - keyrings@vger.kernel.org - linux-security-module@vger.kernel.org - " linux-fscrypt@vger.kernel.org\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "fscrypt uses a master key for each directory policy from\n" @@ -79,7 +66,7 @@ " keyctl add trusted kmk \"load $(cat /keys/kmk.blob)\" @u\n" " keyctl add encrypted fscrypt:1234567890123456 \"load $(cat /keys/fscrypt.blob)\" @u\n" "\n" - "Signed-off-by: Andr\304\202\302\251 Draszik <git@andred.net>\n" + "Signed-off-by: Andr? Draszik <git@andred.net>\n" "Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>\n" "Cc: David Howells <dhowells@redhat.com>\n" "Cc: James Morris <james.l.morris@oracle.com>\n" @@ -88,11 +75,11 @@ "Cc: Jaegeuk Kim <jaegeuk@kernel.org>\n" "Cc: Kees Cook <keescook@chromium.org>\n" "Cc: Eric Biggers <ebiggers@google.com>\n" - "Cc: linux-integrity@vger.kernel.org\n" - "Cc: keyrings@vger.kernel.org\n" - "Cc: linux-security-module@vger.kernel.org\n" - "Cc: linux-fscrypt@vger.kernel.org\n" - "Cc: linux-kernel@vger.kernel.org\n" + "Cc: linux-integrity at vger.kernel.org\n" + "Cc: keyrings at vger.kernel.org\n" + "Cc: linux-security-module at vger.kernel.org\n" + "Cc: linux-fscrypt at vger.kernel.org\n" + "Cc: linux-kernel at vger.kernel.org\n" "\n" "---\n" "changes in v3:\n" @@ -194,7 +181,7 @@ "+ $ keyctl add encrypted fscrypt:1234567890123456 \"load $(cat fscrypt.blob)\" @u\n" "+\n" " Access semantics\n" - " ========\n" + " ================\n" " \n" "diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c\n" "index 5e6e846f5a24..3d20addadcd4 100644\n" @@ -271,7 +258,7 @@ " \t\treturn -ENOMEM;\n" " \n" " \tkeyring_key = request_key(&key_type_logon, description, NULL);\n" - "+\tif (keyring_key = ERR_PTR(-ENOKEY))\n" + "+\tif (keyring_key == ERR_PTR(-ENOKEY))\n" "+\t\tkeyring_key = fscrypt_get_encrypted_key(description);\n" " \tkfree(description);\n" " \tif (IS_ERR(keyring_key))\n" @@ -279,7 +266,7 @@ " \tdown_read(&keyring_key->sem);\n" " \n" "-\tif (keyring_key->type != &key_type_logon) {\n" - "+\tif (keyring_key->type = &key_type_logon) {\n" + "+\tif (keyring_key->type == &key_type_logon) {\n" "+\t\tconst struct user_key_payload *ukp;\n" "+\t\tconst struct fscrypt_key *fk;\n" "+\n" @@ -296,7 +283,7 @@ "+\t\tfk = (struct fscrypt_key *)ukp->data;\n" "+\t\tmaster_key = fk->raw;\n" "+\t\tmaster_key_len = fk->size;\n" - "+\t} else if (keyring_key->type = &key_type_encrypted) {\n" + "+\t} else if (keyring_key->type == &key_type_encrypted) {\n" "+\t\tconst struct encrypted_key_payload *ekp;\n" "+\n" "+\t\tekp = keyring_key->payload.data[0];\n" @@ -357,14 +344,14 @@ "+\t\t\t\t\t\tinode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tkeysize);\n" " \t\tif (res2) {\n" - " \t\t\tif (res2 = -ENOKEY)\n" + " \t\t\tif (res2 == -ENOKEY)\n" " \t\t\t\tres = -ENOKEY;\n" "-- \n" "2.15.1\n" "\n" "--\n" - "To unsubscribe from this list: send the line \"unsubscribe keyrings\" in\n" - "the body of a message to majordomo@vger.kernel.org\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 -3c7aab24202a22d20f4e99e698efe1b33c5c091885aa19b7351d49694ab58503 +852007803f16665b53d201aef6ce037790b65e0982775d234ea31f9bad3b71c4
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.