diff for duplicates of <20190520172552.217253-6-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 5cc57dc..9959ebe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -319,7 +319,7 @@ index 49764d335c370..0000000000000 - 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 49764d335c370..0000000000000 - "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; @@ -696,10 +697,10 @@ index 49764d335c370..0000000000000 - if (res) - goto out; - -- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) +- if (cmpxchg_release(&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); @@ -1032,10 +1033,10 @@ index 0000000000000..d9748999f3a68 + if (res) + goto out; + -+ if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) ++ if (cmpxchg_release(&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; @@ -1400,7 +1401,7 @@ index 0000000000000..407daa0b64d82 + 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 f0de02d..cb55a57 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 05/16] fscrypt: refactor v1 policy key setup into keysetup_legacy.c\0" - "Date\0Mon, 20 May 2019 17:25:41 +0000\0" + "Date\0Mon, 20 May 2019 10:25:41 -0700\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" @@ -712,10 +713,10 @@ "-\tif (res)\n" "-\t\tgoto out;\n" "-\n" - "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "-\tif (cmpxchg_release(&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" @@ -1048,10 +1049,10 @@ "+\tif (res)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "+\tif (cmpxchg_release(&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" @@ -1416,7 +1417,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" @@ -1454,4 +1455,4 @@ "-- \n" 2.21.0.1020.gf2820cf01a-goog -a0ec48ad3fae875ff82c33225884a28dd581aec71befedc81a5fac3cb10746fc +973fbc6c08ff19259f7f9ab69ac72a525adf9236479348341db64afde3d124b3
diff --git a/a/1.txt b/N2/1.txt index 5cc57dc..9959ebe 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -319,7 +319,7 @@ index 49764d335c370..0000000000000 - 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 49764d335c370..0000000000000 - "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; @@ -696,10 +697,10 @@ index 49764d335c370..0000000000000 - if (res) - goto out; - -- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) +- if (cmpxchg_release(&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); @@ -1032,10 +1033,10 @@ index 0000000000000..d9748999f3a68 + if (res) + goto out; + -+ if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) ++ if (cmpxchg_release(&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; @@ -1400,7 +1401,7 @@ index 0000000000000..407daa0b64d82 + 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 f0de02d..9f19421 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 05/16] fscrypt: refactor v1 policy key setup into keysetup_legacy.c\0" - "Date\0Mon, 20 May 2019 17:25:41 +0000\0" + "Date\0Mon, 20 May 2019 10:25:41 -0700\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" @@ -712,10 +713,10 @@ "-\tif (res)\n" "-\t\tgoto out;\n" "-\n" - "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "-\tif (cmpxchg_release(&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" @@ -1048,10 +1049,10 @@ "+\tif (res)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "+\tif (cmpxchg_release(&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" @@ -1416,7 +1417,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" @@ -1454,4 +1455,4 @@ "-- \n" 2.21.0.1020.gf2820cf01a-goog -a0ec48ad3fae875ff82c33225884a28dd581aec71befedc81a5fac3cb10746fc +269dbbef8293e57907d446fd36d44b152a8de1c560846dd9f34b62fffcca0b77
diff --git a/a/1.txt b/N3/1.txt index 5cc57dc..cec5c97 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -319,7 +319,7 @@ index 49764d335c370..0000000000000 - 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 49764d335c370..0000000000000 - "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; @@ -696,10 +697,10 @@ index 49764d335c370..0000000000000 - if (res) - goto out; - -- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) +- if (cmpxchg_release(&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); @@ -1032,10 +1033,10 @@ index 0000000000000..d9748999f3a68 + if (res) + goto out; + -+ if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) ++ if (cmpxchg_release(&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; @@ -1400,7 +1401,7 @@ index 0000000000000..407daa0b64d82 + 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); @@ -1437,3 +1438,10 @@ index a2b2ceaf33a85..f9d63986c4310 100644 return -EOPNOTSUPP; -- 2.21.0.1020.gf2820cf01a-goog + + + +_______________________________________________ +Linux-f2fs-devel mailing list +Linux-f2fs-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel diff --git a/a/content_digest b/N3/content_digest index f0de02d..c1b4d4e 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0[PATCH v6 05/16] fscrypt: refactor v1 policy key setup into keysetup_legacy.c\0" - "Date\0Mon, 20 May 2019 17:25:41 +0000\0" + "Subject\0[f2fs-dev] [PATCH v6 05/16] fscrypt: refactor v1 policy key setup into keysetup_legacy.c\0" + "Date\0Mon, 20 May 2019 10:25:41 -0700\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" @@ -712,10 +713,10 @@ "-\tif (res)\n" "-\t\tgoto out;\n" "-\n" - "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "-\tif (cmpxchg_release(&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" @@ -1048,10 +1049,10 @@ "+\tif (res)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "+\tif (cmpxchg_release(&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" @@ -1416,7 +1417,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" @@ -1452,6 +1453,13 @@ " {\n" " \treturn -EOPNOTSUPP;\n" "-- \n" - 2.21.0.1020.gf2820cf01a-goog + "2.21.0.1020.gf2820cf01a-goog\n" + "\n" + "\n" + "\n" + "_______________________________________________\n" + "Linux-f2fs-devel mailing list\n" + "Linux-f2fs-devel@lists.sourceforge.net\n" + https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel -a0ec48ad3fae875ff82c33225884a28dd581aec71befedc81a5fac3cb10746fc +4620778ec9db773d4a8617df2cb90d5bc74a956030ebebabdff1bdff34259cb9
diff --git a/a/1.txt b/N4/1.txt index 5cc57dc..385c95a 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -319,7 +319,7 @@ index 49764d335c370..0000000000000 - 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 49764d335c370..0000000000000 - "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; @@ -696,10 +697,10 @@ index 49764d335c370..0000000000000 - if (res) - goto out; - -- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) +- if (cmpxchg_release(&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); @@ -1032,10 +1033,10 @@ index 0000000000000..d9748999f3a68 + if (res) + goto out; + -+ if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) ++ if (cmpxchg_release(&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; @@ -1400,7 +1401,7 @@ index 0000000000000..407daa0b64d82 + 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); @@ -1437,3 +1438,8 @@ index a2b2ceaf33a85..f9d63986c4310 100644 return -EOPNOTSUPP; -- 2.21.0.1020.gf2820cf01a-goog + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N4/content_digest index f0de02d..c23247a 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 05/16] fscrypt: refactor v1 policy key setup into keysetup_legacy.c\0" - "Date\0Mon, 20 May 2019 17:25:41 +0000\0" + "Date\0Mon, 20 May 2019 10:25:41 -0700\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" @@ -712,10 +713,10 @@ "-\tif (res)\n" "-\t\tgoto out;\n" "-\n" - "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "-\tif (cmpxchg_release(&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" @@ -1048,10 +1049,10 @@ "+\tif (res)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" + "+\tif (cmpxchg_release(&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" @@ -1416,7 +1417,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" @@ -1452,6 +1453,11 @@ " {\n" " \treturn -EOPNOTSUPP;\n" "-- \n" - 2.21.0.1020.gf2820cf01a-goog + "2.21.0.1020.gf2820cf01a-goog\n" + "\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -a0ec48ad3fae875ff82c33225884a28dd581aec71befedc81a5fac3cb10746fc +4897734094aa578265e135323c56fe82fc8d25ac156459340ba9708c8291e270
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.