mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-23 08:35:19 -05:00
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: ed4433d723
"fs/affs: make affs exportable"
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
30da870ce4
commit
87fbd639c0
1 changed files with 5 additions and 6 deletions
|
@ -201,6 +201,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
|
||||||
struct super_block *sb = dir->i_sb;
|
struct super_block *sb = dir->i_sb;
|
||||||
struct buffer_head *bh;
|
struct buffer_head *bh;
|
||||||
struct inode *inode = NULL;
|
struct inode *inode = NULL;
|
||||||
|
struct dentry *res;
|
||||||
|
|
||||||
pr_debug("%s(\"%pd\")\n", __func__, dentry);
|
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);
|
affs_brelse(bh);
|
||||||
inode = affs_iget(sb, ino);
|
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);
|
affs_unlock_dir(dir);
|
||||||
return NULL;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
Loading…
Add table
Reference in a new issue