Commit 6b609e3b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs fixes from Al Viro.

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  gfs2_meta: ->mount() can get NULL dev_name
  ecryptfs_rename(): verify that lower dentries are still OK after lock_rename()
  cachefiles: fix the race between cachefiles_bury_object() and rmdir(2)
parents deba28b1 3df629d8

fs/ecryptfs/inode.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -593,11 +593,16 @@ ecryptfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	lower_new_dir_dentry = dget_parent(lower_new_dentry);

	lower_new_dir_dentry = dget_parent(lower_new_dentry);

	target_inode = d_inode(new_dentry);

	target_inode = d_inode(new_dentry);

	trap = lock_rename(lower_old_dir_dentry, lower_new_dir_dentry);

	trap = lock_rename(lower_old_dir_dentry, lower_new_dir_dentry);

	/* source should not be ancestor of target */

	if (trap == lower_old_dentry) {

	rc = -EINVAL;

	rc = -EINVAL;

	if (lower_old_dentry->d_parent != lower_old_dir_dentry)

		goto out_lock;

	if (lower_new_dentry->d_parent != lower_new_dir_dentry)

		goto out_lock;

	if (d_unhashed(lower_old_dentry) || d_unhashed(lower_new_dentry))

		goto out_lock;

	/* source should not be ancestor of target */

	if (trap == lower_old_dentry)

		goto out_lock;

		goto out_lock;

	}

	/* target should not be ancestor of source */

	/* target should not be ancestor of source */

	if (trap == lower_new_dentry) {

	if (trap == lower_new_dentry) {

		rc = -ENOTEMPTY;

		rc = -ENOTEMPTY;

fs/gfs2/ops_fstype.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1333,6 +1333,9 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, 
	struct path path;

	struct path path;

	int error;

	int error;





	if (!dev_name || !*dev_name)

		return ERR_PTR(-EINVAL);



	error = kern_path(dev_name, LOOKUP_FOLLOW, &path);

	error = kern_path(dev_name, LOOKUP_FOLLOW, &path);

	if (error) {

	if (error) {

		pr_warn("path_lookup on %s returned error %d\n",

		pr_warn("path_lookup on %s returned error %d\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE