Unverified Commit b306e90f authored by Amir Goldstein's avatar Amir Goldstein Committed by Christian Brauner (Microsoft)
Browse files

ovl: remove privs in ovl_copyfile() 



Underlying fs doesn't remove privs because copy_range/remap_range are
called with privileged mounter credentials.

This fixes some failures in fstest generic/673.

Fixes: 8ede2055 ("ovl: add reflink/copyfile/dedup support")
Acked-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
parent ed5a7047

fs/overlayfs/file.c

+14 −2
Original line number Diff line number Diff line
@@ -567,14 +567,23 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, 
	const struct cred *old_cred;

	loff_t ret;



	inode_lock(inode_out);

	if (op != OVL_DEDUPE) {

		/* Update mode */

		ovl_copyattr(inode_out);

		ret = file_remove_privs(file_out);

		if (ret)

			goto out_unlock;

	}



	ret = ovl_real_fdget(file_out, &real_out);

	if (ret)

		return ret;

		goto out_unlock;



	ret = ovl_real_fdget(file_in, &real_in);

	if (ret) {

		fdput(real_out);

		return ret;

		goto out_unlock;

	}



	old_cred = ovl_override_creds(file_inode(file_out)->i_sb);
@@ -603,6 +612,9 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, 
	fdput(real_in);

	fdput(real_out);



out_unlock:

	inode_unlock(inode_out);



	return ret;

}