Unverified Commit 09406ad8 authored by Christian Brauner's avatar Christian Brauner
Browse files

Merge tag 'for-next-6.9' of... 

Merge tag 'for-next-6.9' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krisman/unicode into vfs.misc

Merge case-insensitive updates from Gabriel Krisman Bertazi:

- Patch case-insensitive lookup by trying the case-exact comparison
  first, before falling back to costly utf8 casefolded comparison.

- Fix to forbid using a case-insensitive directory as part of an
  overlayfs mount.

- Patchset to ensure d_op are set at d_alloc time for fscrypt and
  casefold volumes, ensuring filesystem dentries will all have the
  correct ops, whether they come from a lookup or not.

* tag 'for-next-6.9' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krisman/unicode

:
  libfs: Drop generic_set_encrypted_ci_d_ops
  ubifs: Configure dentry operations at dentry-creation time
  f2fs: Configure dentry operations at dentry-creation time
  ext4: Configure dentry operations at dentry-creation time
  libfs: Add helper to choose dentry operations at mount-time
  libfs: Merge encrypted_ci_dentry_ops and ci_dentry_ops
  fscrypt: Drop d_revalidate once the key is added
  fscrypt: Drop d_revalidate for valid dentries during lookup
  fscrypt: Factor out a helper to configure the lookup dentry
  ovl: Always reject mounting over case-insensitive directories
  libfs: Attempt exact-match comparison first during casefolded lookup

Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parents 91e78a1e 101c3fad

fs/crypto/hooks.c

+5 −10
Original line number Diff line number Diff line
@@ -102,11 +102,8 @@ int __fscrypt_prepare_lookup(struct inode *dir, struct dentry *dentry, 
	if (err && err != -ENOENT)

		return err;



	if (fname->is_nokey_name) {

		spin_lock(&dentry->d_lock);

		dentry->d_flags |= DCACHE_NOKEY_NAME;

		spin_unlock(&dentry->d_lock);

	}

	fscrypt_prepare_dentry(dentry, fname->is_nokey_name);



	return err;

}

EXPORT_SYMBOL_GPL(__fscrypt_prepare_lookup);
@@ -131,12 +128,10 @@ EXPORT_SYMBOL_GPL(__fscrypt_prepare_lookup); 
int fscrypt_prepare_lookup_partial(struct inode *dir, struct dentry *dentry)

{

	int err = fscrypt_get_encryption_info(dir, true);

	bool is_nokey_name = (!err && !fscrypt_has_encryption_key(dir));



	fscrypt_prepare_dentry(dentry, is_nokey_name);



	if (!err && !fscrypt_has_encryption_key(dir)) {

		spin_lock(&dentry->d_lock);

		dentry->d_flags |= DCACHE_NOKEY_NAME;

		spin_unlock(&dentry->d_lock);

	}

	return err;

}

EXPORT_SYMBOL_GPL(fscrypt_prepare_lookup_partial);

fs/ext4/namei.c

+0 −1
Original line number Diff line number Diff line
@@ -1762,7 +1762,6 @@ static struct buffer_head *ext4_lookup_entry(struct inode *dir, 
	struct buffer_head *bh;



	err = ext4_fname_prepare_lookup(dir, dentry, &fname);

	generic_set_encrypted_ci_d_ops(dentry);

	if (err == -ENOENT)

		return NULL;

	if (err)

fs/ext4/super.c

+1 −0
Original line number Diff line number Diff line
@@ -5484,6 +5484,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) 
		goto failed_mount4;

	}



	generic_set_sb_d_ops(sb);

	sb->s_root = d_make_root(root);

	if (!sb->s_root) {

		ext4_msg(sb, KERN_ERR, "get root dentry failed");

fs/f2fs/namei.c

+0 −1
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, 
	}



	err = f2fs_prepare_lookup(dir, dentry, &fname);

	generic_set_encrypted_ci_d_ops(dentry);

	if (err == -ENOENT)

		goto out_splice;

	if (err)

fs/f2fs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -4660,6 +4660,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
		goto free_node_inode;

	}



	generic_set_sb_d_ops(sb);

	sb->s_root = d_make_root(root); /* allocate root dentry */

	if (!sb->s_root) {

		err = -ENOMEM;