diff for duplicates of <20190220065249.32099-7-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 9e8893d..7a72c54 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -319,7 +319,7 @@ index 6c1e675d4eef..000000000000 - key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, - ctx->master_key_descriptor, - mode->keysize, &payload); -- if (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { +- if (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { - key = find_and_lock_process_key(inode->i_sb->s_cop->key_prefix, - ctx->master_key_descriptor, - mode->keysize, &payload); @@ -333,7 +333,8 @@ index 6c1e675d4eef..000000000000 - "direct key mode not allowed with %s", - mode->friendly_name); - err = -EINVAL; -- } else if (ctx->contents_encryption_mode !- ctx->filenames_encryption_mode) { +- } else if (ctx->contents_encryption_mode != +- ctx->filenames_encryption_mode) { - fscrypt_warn(inode->i_sb, - "direct key mode not allowed with different contents and filenames modes"); - err = -EINVAL; @@ -697,10 +698,10 @@ index 6c1e675d4eef..000000000000 - if (res) - goto out; - -- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) +- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) - crypt_info = NULL; -out: -- if (res = -ENOKEY) +- if (res == -ENOKEY) - res = 0; - put_crypt_info(crypt_info); - kzfree(raw_key); @@ -1013,10 +1014,10 @@ index 000000000000..898a82d5ff3c + if (res) + goto out; + -+ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) ++ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) + crypt_info = NULL; +out: -+ if (res = -ENOKEY) ++ if (res == -ENOKEY) + res = 0; + put_crypt_info(crypt_info); + return res; @@ -1360,7 +1361,7 @@ index 000000000000..585d7e31e8f4 + key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, + ci->ci_master_key_descriptor, + ci->ci_mode->keysize, &payload); -+ if (key = ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) { ++ if (key == ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) { + key = find_and_lock_process_key(ci->ci_inode->i_sb->s_cop->key_prefix, + ci->ci_master_key_descriptor, + ci->ci_mode->keysize, &payload); diff --git a/a/content_digest b/N1/content_digest index db79669..ac1dd46 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 06/18] fscrypt: refactor v1 policy key setup into keysetup_legacy.c\0" - "Date\0Wed, 20 Feb 2019 06:52:37 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:37 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -335,7 +335,7 @@ "-\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" "-\t\t\t\t\tctx->master_key_descriptor,\n" "-\t\t\t\t\tmode->keysize, &payload);\n" - "-\tif (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" + "-\tif (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" "-\t\tkey = find_and_lock_process_key(inode->i_sb->s_cop->key_prefix,\n" "-\t\t\t\t\t\tctx->master_key_descriptor,\n" "-\t\t\t\t\t\tmode->keysize, &payload);\n" @@ -349,7 +349,8 @@ "-\t\t\t\t \"direct key mode not allowed with %s\",\n" "-\t\t\t\t mode->friendly_name);\n" "-\t\t\terr = -EINVAL;\n" - "-\t\t} else if (ctx->contents_encryption_mode !-\t\t\t ctx->filenames_encryption_mode) {\n" + "-\t\t} else if (ctx->contents_encryption_mode !=\n" + "-\t\t\t ctx->filenames_encryption_mode) {\n" "-\t\t\tfscrypt_warn(inode->i_sb,\n" "-\t\t\t\t \"direct key mode not allowed with different contents and filenames modes\");\n" "-\t\t\terr = -EINVAL;\n" @@ -713,10 +714,10 @@ "-\tif (res)\n" "-\t\tgoto out;\n" "-\n" - "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" "-\t\tcrypt_info = NULL;\n" "-out:\n" - "-\tif (res = -ENOKEY)\n" + "-\tif (res == -ENOKEY)\n" "-\t\tres = 0;\n" "-\tput_crypt_info(crypt_info);\n" "-\tkzfree(raw_key);\n" @@ -1029,10 +1030,10 @@ "+\tif (res)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" "+\t\tcrypt_info = NULL;\n" "+out:\n" - "+\tif (res = -ENOKEY)\n" + "+\tif (res == -ENOKEY)\n" "+\t\tres = 0;\n" "+\tput_crypt_info(crypt_info);\n" "+\treturn res;\n" @@ -1376,7 +1377,7 @@ "+\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" "+\t\t\t\t\tci->ci_master_key_descriptor,\n" "+\t\t\t\t\tci->ci_mode->keysize, &payload);\n" - "+\tif (key = ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) {\n" + "+\tif (key == ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) {\n" "+\t\tkey = find_and_lock_process_key(ci->ci_inode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tci->ci_master_key_descriptor,\n" "+\t\t\t\t\t\tci->ci_mode->keysize, &payload);\n" @@ -1414,4 +1415,4 @@ "-- \n" 2.20.1 -8824004cadd0986291dd8b1fc0359d61d2222d7b800dc910b954e9230ed0e12b +218a3ccbc22347991825ab35dc73f3f79a76c641e56b1dba49c034a831b2f02f
diff --git a/a/1.txt b/N2/1.txt index 9e8893d..7a72c54 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -319,7 +319,7 @@ index 6c1e675d4eef..000000000000 - key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, - ctx->master_key_descriptor, - mode->keysize, &payload); -- if (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { +- if (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { - key = find_and_lock_process_key(inode->i_sb->s_cop->key_prefix, - ctx->master_key_descriptor, - mode->keysize, &payload); @@ -333,7 +333,8 @@ index 6c1e675d4eef..000000000000 - "direct key mode not allowed with %s", - mode->friendly_name); - err = -EINVAL; -- } else if (ctx->contents_encryption_mode !- ctx->filenames_encryption_mode) { +- } else if (ctx->contents_encryption_mode != +- ctx->filenames_encryption_mode) { - fscrypt_warn(inode->i_sb, - "direct key mode not allowed with different contents and filenames modes"); - err = -EINVAL; @@ -697,10 +698,10 @@ index 6c1e675d4eef..000000000000 - if (res) - goto out; - -- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) +- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) - crypt_info = NULL; -out: -- if (res = -ENOKEY) +- if (res == -ENOKEY) - res = 0; - put_crypt_info(crypt_info); - kzfree(raw_key); @@ -1013,10 +1014,10 @@ index 000000000000..898a82d5ff3c + if (res) + goto out; + -+ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) ++ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) + crypt_info = NULL; +out: -+ if (res = -ENOKEY) ++ if (res == -ENOKEY) + res = 0; + put_crypt_info(crypt_info); + return res; @@ -1360,7 +1361,7 @@ index 000000000000..585d7e31e8f4 + key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, + ci->ci_master_key_descriptor, + ci->ci_mode->keysize, &payload); -+ if (key = ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) { ++ if (key == ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) { + key = find_and_lock_process_key(ci->ci_inode->i_sb->s_cop->key_prefix, + ci->ci_master_key_descriptor, + ci->ci_mode->keysize, &payload); diff --git a/a/content_digest b/N2/content_digest index db79669..469f0b3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 06/18] fscrypt: refactor v1 policy key setup into keysetup_legacy.c\0" - "Date\0Wed, 20 Feb 2019 06:52:37 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:37 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" - "Cc\0linux-ext4@vger.kernel.org" + "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org linux-f2fs-devel@lists.sourceforge.net keyrings@vger.kernel.org linux-mtd@lists.infradead.org linux-crypto@vger.kernel.org linux-fsdevel@vger.kernel.org - Satya Tangirala <satyat@google.com> + linux-ext4@vger.kernel.org " Paul Crowley <paulcrowley@google.com>\0" "\00:1\0" "b\0" @@ -335,7 +335,7 @@ "-\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" "-\t\t\t\t\tctx->master_key_descriptor,\n" "-\t\t\t\t\tmode->keysize, &payload);\n" - "-\tif (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" + "-\tif (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" "-\t\tkey = find_and_lock_process_key(inode->i_sb->s_cop->key_prefix,\n" "-\t\t\t\t\t\tctx->master_key_descriptor,\n" "-\t\t\t\t\t\tmode->keysize, &payload);\n" @@ -349,7 +349,8 @@ "-\t\t\t\t \"direct key mode not allowed with %s\",\n" "-\t\t\t\t mode->friendly_name);\n" "-\t\t\terr = -EINVAL;\n" - "-\t\t} else if (ctx->contents_encryption_mode !-\t\t\t ctx->filenames_encryption_mode) {\n" + "-\t\t} else if (ctx->contents_encryption_mode !=\n" + "-\t\t\t ctx->filenames_encryption_mode) {\n" "-\t\t\tfscrypt_warn(inode->i_sb,\n" "-\t\t\t\t \"direct key mode not allowed with different contents and filenames modes\");\n" "-\t\t\terr = -EINVAL;\n" @@ -713,10 +714,10 @@ "-\tif (res)\n" "-\t\tgoto out;\n" "-\n" - "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" "-\t\tcrypt_info = NULL;\n" "-out:\n" - "-\tif (res = -ENOKEY)\n" + "-\tif (res == -ENOKEY)\n" "-\t\tres = 0;\n" "-\tput_crypt_info(crypt_info);\n" "-\tkzfree(raw_key);\n" @@ -1029,10 +1030,10 @@ "+\tif (res)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" "+\t\tcrypt_info = NULL;\n" "+out:\n" - "+\tif (res = -ENOKEY)\n" + "+\tif (res == -ENOKEY)\n" "+\t\tres = 0;\n" "+\tput_crypt_info(crypt_info);\n" "+\treturn res;\n" @@ -1376,7 +1377,7 @@ "+\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" "+\t\t\t\t\tci->ci_master_key_descriptor,\n" "+\t\t\t\t\tci->ci_mode->keysize, &payload);\n" - "+\tif (key = ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) {\n" + "+\tif (key == ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) {\n" "+\t\tkey = find_and_lock_process_key(ci->ci_inode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tci->ci_master_key_descriptor,\n" "+\t\t\t\t\t\tci->ci_mode->keysize, &payload);\n" @@ -1414,4 +1415,4 @@ "-- \n" 2.20.1 -8824004cadd0986291dd8b1fc0359d61d2222d7b800dc910b954e9230ed0e12b +526010450606726b2612cbec1766e468e8ad85ca0f510192dbbdab989bdcbdf5
diff --git a/a/1.txt b/N3/1.txt index 9e8893d..5829914 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -319,7 +319,7 @@ index 6c1e675d4eef..000000000000 - key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, - ctx->master_key_descriptor, - mode->keysize, &payload); -- if (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { +- if (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { - key = find_and_lock_process_key(inode->i_sb->s_cop->key_prefix, - ctx->master_key_descriptor, - mode->keysize, &payload); @@ -333,7 +333,8 @@ index 6c1e675d4eef..000000000000 - "direct key mode not allowed with %s", - mode->friendly_name); - err = -EINVAL; -- } else if (ctx->contents_encryption_mode !- ctx->filenames_encryption_mode) { +- } else if (ctx->contents_encryption_mode != +- ctx->filenames_encryption_mode) { - fscrypt_warn(inode->i_sb, - "direct key mode not allowed with different contents and filenames modes"); - err = -EINVAL; @@ -697,10 +698,10 @@ index 6c1e675d4eef..000000000000 - if (res) - goto out; - -- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) +- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) - crypt_info = NULL; -out: -- if (res = -ENOKEY) +- if (res == -ENOKEY) - res = 0; - put_crypt_info(crypt_info); - kzfree(raw_key); @@ -1013,10 +1014,10 @@ index 000000000000..898a82d5ff3c + if (res) + goto out; + -+ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) ++ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) + crypt_info = NULL; +out: -+ if (res = -ENOKEY) ++ if (res == -ENOKEY) + res = 0; + put_crypt_info(crypt_info); + return res; @@ -1360,7 +1361,7 @@ index 000000000000..585d7e31e8f4 + key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, + ci->ci_master_key_descriptor, + ci->ci_mode->keysize, &payload); -+ if (key = ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) { ++ if (key == ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) { + key = find_and_lock_process_key(ci->ci_inode->i_sb->s_cop->key_prefix, + ci->ci_master_key_descriptor, + ci->ci_mode->keysize, &payload); @@ -1397,3 +1398,8 @@ index 8b1e44421497..5afb9fc13ef4 100644 return -EOPNOTSUPP; -- 2.20.1 + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N3/content_digest index db79669..a8d092f 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 06/18] fscrypt: refactor v1 policy key setup into keysetup_legacy.c\0" - "Date\0Wed, 20 Feb 2019 06:52:37 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:37 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -335,7 +335,7 @@ "-\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" "-\t\t\t\t\tctx->master_key_descriptor,\n" "-\t\t\t\t\tmode->keysize, &payload);\n" - "-\tif (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" + "-\tif (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" "-\t\tkey = find_and_lock_process_key(inode->i_sb->s_cop->key_prefix,\n" "-\t\t\t\t\t\tctx->master_key_descriptor,\n" "-\t\t\t\t\t\tmode->keysize, &payload);\n" @@ -349,7 +349,8 @@ "-\t\t\t\t \"direct key mode not allowed with %s\",\n" "-\t\t\t\t mode->friendly_name);\n" "-\t\t\terr = -EINVAL;\n" - "-\t\t} else if (ctx->contents_encryption_mode !-\t\t\t ctx->filenames_encryption_mode) {\n" + "-\t\t} else if (ctx->contents_encryption_mode !=\n" + "-\t\t\t ctx->filenames_encryption_mode) {\n" "-\t\t\tfscrypt_warn(inode->i_sb,\n" "-\t\t\t\t \"direct key mode not allowed with different contents and filenames modes\");\n" "-\t\t\terr = -EINVAL;\n" @@ -713,10 +714,10 @@ "-\tif (res)\n" "-\t\tgoto out;\n" "-\n" - "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" "-\t\tcrypt_info = NULL;\n" "-out:\n" - "-\tif (res = -ENOKEY)\n" + "-\tif (res == -ENOKEY)\n" "-\t\tres = 0;\n" "-\tput_crypt_info(crypt_info);\n" "-\tkzfree(raw_key);\n" @@ -1029,10 +1030,10 @@ "+\tif (res)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" "+\t\tcrypt_info = NULL;\n" "+out:\n" - "+\tif (res = -ENOKEY)\n" + "+\tif (res == -ENOKEY)\n" "+\t\tres = 0;\n" "+\tput_crypt_info(crypt_info);\n" "+\treturn res;\n" @@ -1376,7 +1377,7 @@ "+\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" "+\t\t\t\t\tci->ci_master_key_descriptor,\n" "+\t\t\t\t\tci->ci_mode->keysize, &payload);\n" - "+\tif (key = ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) {\n" + "+\tif (key == ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) {\n" "+\t\tkey = find_and_lock_process_key(ci->ci_inode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tci->ci_master_key_descriptor,\n" "+\t\t\t\t\t\tci->ci_mode->keysize, &payload);\n" @@ -1412,6 +1413,11 @@ " {\n" " \treturn -EOPNOTSUPP;\n" "-- \n" - 2.20.1 + "2.20.1\n" + "\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -8824004cadd0986291dd8b1fc0359d61d2222d7b800dc910b954e9230ed0e12b +a62928b08687764f501b8a5160b79b9af8d4ccd5a9803dd36539820fa78912e5
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.