On Fri, Feb 07, 2020 at 05:35:50PM -0800, Daniel Rosenberg wrote:
> This expands f2fs's casefolding support to include encrypted
> directories. For encrypted directories, we use the siphash of the
> casefolded name. This ensures there is no direct way to go from an
> unencrypted name to the stored hash on disk without knowledge of the
> encryption policy keys.
>
> Additionally, we switch to using the vfs layer's casefolding support
> instead of storing this information inside of f2fs's private data.
>
> Signed-off-by: Daniel Rosenberg <drosen@xxxxxxxxxx>
> ---
> fs/f2fs/dir.c | 65 ++++++++++++++++++++++++++++++++----------------
> fs/f2fs/f2fs.h | 8 +++---
> fs/f2fs/hash.c | 23 +++++++++++------
> fs/f2fs/inline.c | 9 ++++---
> fs/f2fs/super.c | 6 -----
> 5 files changed, 68 insertions(+), 43 deletions(-)
>
> diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
> index 38c0e6d589be4..3517dd4060341 100644
> --- a/fs/f2fs/dir.c
> +++ b/fs/f2fs/dir.c
> @@ -112,30 +112,50 @@ static struct f2fs_dir_entry *find_in_block(struct inode *dir,
> * doesn't match or less than zero on error.
> */
> int f2fs_ci_compare(const struct inode *parent, const struct qstr *name,
> - const struct qstr *entry, bool quick)
> + unsigned char *name2, size_t len, bool quick)
> {
> const struct super_block *sb = parent->i_sb;
> const struct unicode_map *um = sb->s_encoding;
> + const struct fscrypt_str crypt_entry = FSTR_INIT(name2, len);
> + struct fscrypt_str decrypted_entry;
> + struct qstr decrypted;
> + struct qstr entry = QSTR_INIT(name2, len);
> + struct qstr *tocheck;
> int ret;
>
> + decrypted_entry.name = NULL;
> +
> + if (IS_ENCRYPTED(parent) && fscrypt_has_encryption_key(parent)) {
> + decrypted_entry.name = kmalloc(len, GFP_ATOMIC);
> + decrypted.name = decrypted_entry.name;
> + decrypted_entry.len = len;
> + decrypted.len = len;
> + if (!decrypted.name)
> + return -ENOMEM;
> + ret = fscrypt_fname_disk_to_usr(parent, 0, 0, &crypt_entry,
> + &decrypted_entry);
> + if (ret < 0)
> + goto out;
> + }
> + tocheck = decrypted_entry.name ? &decrypted : &entry;
> +
> if (quick)
> - ret = utf8_strncasecmp_folded(um, name, entry);
> + ret = utf8_strncasecmp_folded(um, name, tocheck);
> else
> - ret = utf8_strncasecmp(um, name, entry);
> -
> + ret = utf8_strncasecmp(um, name, tocheck);
> if (ret < 0) {
> /* Handle invalid character sequence as either an error
> * or as an opaque byte sequence.
> */
> if (sb_has_enc_strict_mode(sb))
> - return -EINVAL;
> -
> - if (name->len != entry->len)
> - return 1;
> -
> - return !!memcmp(name->name, entry->name, name->len);
> + ret = -EINVAL;
> + else if (name->len != len)
> + ret = 1;
> + else
> + ret = !!memcmp(name->name, tocheck->name, len);
> }
> -
> +out:
> + kfree(decrypted_entry.name);
> return ret;
> }
The case-sensitive fallback is broken with encrypted filenames; it's checking
the length of the encrypted filename rather than the decrypted filename. The
decrypted name may be shorter.
Can you please improve your testing to catch bugs like this?
IMO, part of the problem is that there are multiple lengths here, so the
variable named 'len' is ambiguous. Can you please clean this function up to
name things properly? Also, the 'tocheck' variable is unnecessary, and it's
confusing having both 'decrypted' and 'decrypted_entry', and to decrypt
conditionally when fscrypt_has_encryption_key() since that's already required.
How about:
int f2fs_ci_compare(const struct inode *parent, const struct qstr *name,
u8 *de_name, size_t de_name_len, bool quick)
{
const struct super_block *sb = parent->i_sb;
const struct unicode_map *um = sb->s_encoding;
struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len);
struct qstr entry = QSTR_INIT(de_name, de_name_len);
int ret;
if (IS_ENCRYPTED(parent)) {
const struct fscrypt_str encrypted_name =
FSTR_INIT(de_name, de_name_len);
decrypted_name.name = kmalloc(de_name_len, GFP_ATOMIC);
if (!decrypted_name.name)
return -ENOMEM;
ret = fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name,
&decrypted_name);
if (ret < 0)
goto out;
entry.name = decrypted_name.name;
entry.len = decrypted_name.len;
}
if (quick)
ret = utf8_strncasecmp_folded(um, name, &entry);
else
ret = utf8_strncasecmp(um, name, &entry);
if (ret < 0) {
/* Handle invalid character sequence as either an error
* or as an opaque byte sequence.
*/
if (sb_has_enc_strict_mode(sb))
ret = -EINVAL;
else if (name->len != entry.len)
ret = 1;
else
ret = !!memcmp(name->name, entry.name, entry.len);
}
out:
kfree(decrypted_name.name);
return ret;
}
Of course, all this applies to ext4_ci_compare() as well.
- Eric
