Commit c914c0e2 authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi
Browse files

ovl: use wrappers to all vfs_*xattr() calls 



Use helpers ovl_*xattr() to access user/trusted.overlay.* xattrs
and use helpers ovl_do_*xattr() to access generic xattrs. This is a
preparatory patch for using idmapped base layers with overlay.

Note that a few of those places called vfs_*xattr() calls directly to
reduce the amount of debug output. But as Miklos pointed out since
overlayfs has been stable for quite some time the debug output isn't all
that relevant anymore and the additional debug in all locations was
actually quite helpful when developing this patch series.

Cc: <linux-unionfs@vger.kernel.org>
Tested-by: default avatarGiuseppe Scrivano <gscrivan@redhat.com>
Reviewed-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 3a761d72

fs/overlayfs/copy_up.c

+11 −10
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int ovl_copy_xattr(struct super_block *sb, struct dentry *old, 
			goto retry;

		}



		error = vfs_setxattr(&init_user_ns, new, name, value, size, 0);

		error = ovl_do_setxattr(OVL_FS(sb), new, name, value, size, 0);

		if (error) {

			if (error != -EOPNOTSUPP || ovl_must_copy_xattr(name))

				break;
@@ -433,7 +433,7 @@ static int ovl_set_upper_fh(struct ovl_fs *ofs, struct dentry *upper, 
	if (IS_ERR(fh))

		return PTR_ERR(fh);



	err = ovl_do_setxattr(ofs, index, OVL_XATTR_UPPER, fh->buf, fh->fb.len);

	err = ovl_setxattr(ofs, index, OVL_XATTR_UPPER, fh->buf, fh->fb.len);



	kfree(fh);

	return err;
@@ -865,12 +865,13 @@ static bool ovl_need_meta_copy_up(struct dentry *dentry, umode_t mode, 
	return true;

}



static ssize_t ovl_getxattr(struct dentry *dentry, char *name, char **value)

static ssize_t ovl_getxattr_value(struct ovl_fs *ofs, struct dentry *dentry,

				  char *name, char **value)

{

	ssize_t res;

	char *buf;



	res = vfs_getxattr(&init_user_ns, dentry, name, NULL, 0);

	res = ovl_do_getxattr(ofs, dentry, name, NULL, 0);

	if (res == -ENODATA || res == -EOPNOTSUPP)

		res = 0;
@@ -879,7 +880,7 @@ static ssize_t ovl_getxattr(struct dentry *dentry, char *name, char **value) 
		if (!buf)

			return -ENOMEM;



		res = vfs_getxattr(&init_user_ns, dentry, name, buf, res);

		res = ovl_do_getxattr(ofs, dentry, name, buf, res);

		if (res < 0)

			kfree(buf);

		else
@@ -906,8 +907,8 @@ static int ovl_copy_up_meta_inode_data(struct ovl_copy_up_ctx *c) 
		return -EIO;



	if (c->stat.size) {

		err = cap_size = ovl_getxattr(upperpath.dentry, XATTR_NAME_CAPS,

					      &capability);

		err = cap_size = ovl_getxattr_value(ofs, upperpath.dentry,

						    XATTR_NAME_CAPS, &capability);

		if (cap_size < 0)

			goto out;

	}
@@ -921,14 +922,14 @@ static int ovl_copy_up_meta_inode_data(struct ovl_copy_up_ctx *c) 
	 * don't want that to happen for normal copy-up operation.

	 */

	if (capability) {

		err = vfs_setxattr(&init_user_ns, upperpath.dentry,

				   XATTR_NAME_CAPS, capability, cap_size, 0);

		err = ovl_do_setxattr(ofs, upperpath.dentry, XATTR_NAME_CAPS,

				      capability, cap_size, 0);

		if (err)

			goto out_free;

	}





	err = ovl_do_removexattr(ofs, upperpath.dentry, OVL_XATTR_METACOPY);

	err = ovl_removexattr(ofs, upperpath.dentry, OVL_XATTR_METACOPY);

	if (err)

		goto out_free;

fs/overlayfs/dir.c

+8 −7
Original line number Diff line number Diff line
@@ -432,8 +432,8 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry, 
	return ERR_PTR(err);

}



static int ovl_set_upper_acl(struct dentry *upperdentry, const char *name,

			     const struct posix_acl *acl)

static int ovl_set_upper_acl(struct ovl_fs *ofs, struct dentry *upperdentry,

			     const char *name, const struct posix_acl *acl)

{

	void *buffer;

	size_t size;
@@ -451,7 +451,7 @@ static int ovl_set_upper_acl(struct dentry *upperdentry, const char *name, 
	if (err < 0)

		goto out_free;



	err = vfs_setxattr(&init_user_ns, upperdentry, name, buffer, size, XATTR_CREATE);

	err = ovl_do_setxattr(ofs, upperdentry, name, buffer, size, XATTR_CREATE);

out_free:

	kfree(buffer);

	return err;
@@ -460,6 +460,7 @@ static int ovl_set_upper_acl(struct dentry *upperdentry, const char *name, 
static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,

				    struct ovl_cattr *cattr)

{

	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);

	struct dentry *workdir = ovl_workdir(dentry);

	struct inode *wdir = workdir->d_inode;

	struct dentry *upperdir = ovl_dentry_upper(dentry->d_parent);
@@ -516,13 +517,13 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode, 
			goto out_cleanup;

	}

	if (!hardlink) {

		err = ovl_set_upper_acl(newdentry, XATTR_NAME_POSIX_ACL_ACCESS,

					acl);

		err = ovl_set_upper_acl(ofs, newdentry,

					XATTR_NAME_POSIX_ACL_ACCESS, acl);

		if (err)

			goto out_cleanup;



		err = ovl_set_upper_acl(newdentry, XATTR_NAME_POSIX_ACL_DEFAULT,

					default_acl);

		err = ovl_set_upper_acl(ofs, newdentry,

					XATTR_NAME_POSIX_ACL_DEFAULT, default_acl);

		if (err)

			goto out_cleanup;

	}

fs/overlayfs/inode.c

+9 −8
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name, 
		  const void *value, size_t size, int flags)

{

	int err;

	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);

	struct dentry *upperdentry = ovl_i_dentry_upper(inode);

	struct dentry *realdentry = upperdentry ?: ovl_dentry_lower(dentry);

	const struct cred *old_cred;
@@ -367,12 +368,12 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name, 
	}



	old_cred = ovl_override_creds(dentry->d_sb);

	if (value)

		err = vfs_setxattr(&init_user_ns, realdentry, name, value, size,

	if (value) {

		err = ovl_do_setxattr(ofs, realdentry, name, value, size,

				      flags);

	else {

	} else {

		WARN_ON(flags != XATTR_REPLACE);

		err = vfs_removexattr(&init_user_ns, realdentry, name);

		err = ovl_do_removexattr(ofs, realdentry, name);

	}

	revert_creds(old_cred);
@@ -871,7 +872,7 @@ static int ovl_set_nlink_common(struct dentry *dentry, 
	if (WARN_ON(len >= sizeof(buf)))

		return -EIO;



	return ovl_do_setxattr(OVL_FS(inode->i_sb), ovl_dentry_upper(dentry),

	return ovl_setxattr(OVL_FS(inode->i_sb), ovl_dentry_upper(dentry),

			    OVL_XATTR_NLINK, buf, len);

}
@@ -897,7 +898,7 @@ unsigned int ovl_get_nlink(struct ovl_fs *ofs, struct dentry *lowerdentry, 
	if (!lowerdentry || !upperdentry || d_inode(lowerdentry)->i_nlink == 1)

		return fallback;



	err = ovl_do_getxattr(ofs, upperdentry, OVL_XATTR_NLINK,

	err = ovl_getxattr(ofs, upperdentry, OVL_XATTR_NLINK,

			      &buf, sizeof(buf) - 1);

	if (err < 0)

		goto fail;

fs/overlayfs/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static struct ovl_fh *ovl_get_fh(struct ovl_fs *ofs, struct dentry *dentry, 
	int res, err;

	struct ovl_fh *fh = NULL;



	res = ovl_do_getxattr(ofs, dentry, ox, NULL, 0);

	res = ovl_getxattr(ofs, dentry, ox, NULL, 0);

	if (res < 0) {

		if (res == -ENODATA || res == -EOPNOTSUPP)

			return NULL;
@@ -125,7 +125,7 @@ static struct ovl_fh *ovl_get_fh(struct ovl_fs *ofs, struct dentry *dentry, 
	if (!fh)

		return ERR_PTR(-ENOMEM);



	res = ovl_do_getxattr(ofs, dentry, ox, fh->buf, res);

	res = ovl_getxattr(ofs, dentry, ox, fh->buf, res);

	if (res < 0)

		goto fail;
@@ -464,7 +464,7 @@ int ovl_verify_set_fh(struct ovl_fs *ofs, struct dentry *dentry, 


	err = ovl_verify_fh(ofs, dentry, ox, fh);

	if (set && err == -ENODATA)

		err = ovl_do_setxattr(ofs, dentry, ox, fh->buf, fh->fb.len);

		err = ovl_setxattr(ofs, dentry, ox, fh->buf, fh->fb.len);

	if (err)

		goto fail;

fs/overlayfs/overlayfs.h

+28 −10
Original line number Diff line number Diff line
@@ -183,10 +183,9 @@ static inline int ovl_do_symlink(struct inode *dir, struct dentry *dentry, 
}



static inline ssize_t ovl_do_getxattr(struct ovl_fs *ofs, struct dentry *dentry,

				      enum ovl_xattr ox, void *value,

				      const char *name, void *value,

				      size_t size)

{

	const char *name = ovl_xattr(ofs, ox);

	int err = vfs_getxattr(&init_user_ns, dentry, name, value, size);

	int len = (value && err > 0) ? err : 0;
@@ -195,26 +194,45 @@ static inline ssize_t ovl_do_getxattr(struct ovl_fs *ofs, struct dentry *dentry, 
	return err;

}



static inline ssize_t ovl_getxattr(struct ovl_fs *ofs, struct dentry *dentry,

				   enum ovl_xattr ox, void *value,

				   size_t size)

{

	return ovl_do_getxattr(ofs, dentry, ovl_xattr(ofs, ox), value, size);

}



static inline int ovl_do_setxattr(struct ovl_fs *ofs, struct dentry *dentry,

				  const char *name, const void *value,

				  size_t size, int flags)

{

	int err = vfs_setxattr(&init_user_ns, dentry, name, value, size, flags);



	pr_debug("setxattr(%pd2, \"%s\", \"%*pE\", %zu, %d) = %i\n",

		 dentry, name, min((int)size, 48), value, size, flags, err);

	return err;

}



static inline int ovl_setxattr(struct ovl_fs *ofs, struct dentry *dentry,

			       enum ovl_xattr ox, const void *value,

			       size_t size)

{

	const char *name = ovl_xattr(ofs, ox);

	int err = vfs_setxattr(&init_user_ns, dentry, name, value, size, 0);

	pr_debug("setxattr(%pd2, \"%s\", \"%*pE\", %zu, 0) = %i\n",

		 dentry, name, min((int)size, 48), value, size, err);

	return err;

	return ovl_do_setxattr(ofs, dentry, ovl_xattr(ofs, ox), value, size, 0);

}



static inline int ovl_do_removexattr(struct ovl_fs *ofs, struct dentry *dentry,

				     enum ovl_xattr ox)

				     const char *name)

{

	const char *name = ovl_xattr(ofs, ox);

	int err = vfs_removexattr(&init_user_ns, dentry, name);

	pr_debug("removexattr(%pd2, \"%s\") = %i\n", dentry, name, err);

	return err;

}



static inline int ovl_removexattr(struct ovl_fs *ofs, struct dentry *dentry,

				  enum ovl_xattr ox)

{

	return ovl_do_removexattr(ofs, dentry, ovl_xattr(ofs, ox));

}



static inline int ovl_do_rename(struct inode *olddir, struct dentry *olddentry,

				struct inode *newdir, struct dentry *newdentry,

				unsigned int flags)