Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87fbd639 authored by Al Viro's avatar Al Viro
Browse files

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: ed4433d7 "fs/affs: make affs exportable"
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 30da870c

fs/affs/namei.c

+5 −6
Original line number Diff line number Diff line
@@ -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