public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-04-13 09:59:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fscrypt_d_revalidate(): use stable parent inode passed by caller

Browse source 
The only thing it's using is parent directory inode and we are already
given a stable reference to that - no need to bother with boilerplate.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2025-01-03 00:58:15 -05:00
parent 541795cb0b
commit c4a9fe6319
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs/crypto/fname.c
View file

@ -574,12 +574,10 @@ EXPORT_SYMBOL_GPL(fscrypt_fname_siphash);
* Validate dentries in encrypted directories to make sure we aren't potentially * Validate dentries in encrypted directories to make sure we aren't potentially
* caching stale dentries after a key has been added. * caching stale dentries after a key has been added.
*/ */
int fscrypt_d_revalidate(struct inode *parent_dir, const struct qstr *name, int fscrypt_d_revalidate(struct inode *dir, const struct qstr *name,
struct dentry *dentry, unsigned int flags) struct dentry *dentry, unsigned int flags)
{ {
struct dentry *dir;
int err; int err;
int valid;
/* /*
* Plaintext names are always valid, since fscrypt doesn't support * Plaintext names are always valid, since fscrypt doesn't support
@ -592,30 +590,21 @@ int fscrypt_d_revalidate(struct inode *parent_dir, const struct qstr *name,
/* /*
* No-key name; valid if the directory's key is still unavailable. * No-key name; valid if the directory's key is still unavailable.
* *
* Although fscrypt forbids rename() on no-key names, we still must use * Note in RCU mode we have to bail if we get here -
* dget_parent() here rather than use ->d_parent directly. That's * fscrypt_get_encryption_info() may block.
* because a corrupted fs image may contain directory hard links, which
* the VFS handles by moving the directory's dentry tree in the dcache
* each time ->lookup() finds the directory and it already has a dentry
* elsewhere. Thus ->d_parent can be changing, and we must safely grab
* a reference to some ->d_parent to prevent it from being freed.
*/ */
if (flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
dir = dget_parent(dentry);
/* /*
* Pass allow_unsupported=true, so that files with an unsupported * Pass allow_unsupported=true, so that files with an unsupported
* encryption policy can be deleted. * encryption policy can be deleted.
*/ */
err = fscrypt_get_encryption_info(d_inode(dir), true); err = fscrypt_get_encryption_info(dir, true);
valid = !fscrypt_has_encryption_key(d_inode(dir));
dput(dir);
if (err < 0) if (err < 0)
return err; return err;
return valid; return !fscrypt_has_encryption_key(dir);
} }
EXPORT_SYMBOL_GPL(fscrypt_d_revalidate); EXPORT_SYMBOL_GPL(fscrypt_d_revalidate);