diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-05-06 12:20:40 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-05-21 14:29:12 -0400 |
| commit | 87fbd639c02ec96d67738e40b6521fb070ed7168 (patch) | |
| tree | a11ad3f7b598cddf1a18236ed13f4a86d16e288e /fs/affs | |
| parent | 30da870ce4a4e007c901858a96e9e394a1daa74a (diff) | |
| download | linux-87fbd639c02ec96d67738e40b6521fb070ed7168.tar.gz linux-87fbd639c02ec96d67738e40b6521fb070ed7168.tar.bz2 linux-87fbd639c02ec96d67738e40b6521fb070ed7168.zip | |
affs_lookup: switch to d_splice_alias()
Making something exportable takes more than providing ->s_export_ops.
In particular, ->lookup() *MUST* use d_splice_alias() instead of
d_add().
Reading Documentation/filesystems/nfs/Exporting would've been a good idea;
as it is, exporting AFFS is badly (and exploitably) broken.
Partially-Fixes: ed4433d72394 "fs/affs: make affs exportable"
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/namei.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/affs/namei.c b/fs/affs/namei.c index 1ed0fa4c4d48..41c5749f4db7 100644 --- a/fs/affs/namei.c +++ b/fs/affs/namei.c @@ -201,6 +201,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) struct super_block *sb = dir->i_sb; struct buffer_head *bh; struct inode *inode = NULL; + struct dentry *res; pr_debug("%s(\"%pd\")\n", __func__, dentry); @@ -223,14 +224,12 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) } affs_brelse(bh); inode = affs_iget(sb, ino); - if (IS_ERR(inode)) { - affs_unlock_dir(dir); - return ERR_CAST(inode); - } } - d_add(dentry, inode); + res = d_splice_alias(inode, dentry); + if (!IS_ERR_OR_NULL(res)) + res->d_fsdata = dentry->d_fsdata; affs_unlock_dir(dir); - return NULL; + return res; } int |