Skip to content

Commit

Permalink
affs_lookup: switch to d_splice_alias()
Browse files Browse the repository at this point in the history
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: ed4433d "fs/affs: make affs exportable"
Acked-by: David Sterba <[email protected]>
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed May 21, 2018
1 parent 30da870 commit 87fbd63
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions fs/affs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down

0 comments on commit 87fbd63

Please sign in to comment.