Commit 5f3a4a28 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Pass a userns parameter into posix_acl_to_xattr and posix_acl_from_xattr 



 - Pass the user namespace the uid and gid values in the xattr are stored
   in into posix_acl_from_xattr.

 - Pass the user namespace kuid and kgid values should be converted into
   when storing uid and gid values in an xattr in posix_acl_to_xattr.

- Modify all callers of posix_acl_from_xattr and posix_acl_to_xattr to
  pass in &init_user_ns.

In the short term this change is not strictly needed but it makes the
code clearer.  In the longer term this change is necessary to be able to
mount filesystems outside of the initial user namespace that natively
store posix acls in the linux xattr format.

Cc: Theodore Tso <tytso@mit.edu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: Jan Kara <jack@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 2f6f0654

fs/9p/acl.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, char *name) 
			return ERR_PTR(-ENOMEM);

		size = v9fs_fid_xattr_get(fid, name, value, size);

		if (size > 0) {

			acl = posix_acl_from_xattr(value, size);

			acl = posix_acl_from_xattr(&init_user_ns, value, size);

			if (IS_ERR(acl))

				goto err_out;

		}
@@ -131,7 +131,7 @@ static int v9fs_set_acl(struct dentry *dentry, int type, struct posix_acl *acl) 
	buffer = kmalloc(size, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;

	retval = posix_acl_to_xattr(acl, buffer, size);

	retval = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);

	if (retval < 0)

		goto err_free_out;

	switch (type) {
@@ -251,7 +251,7 @@ static int v9fs_xattr_get_acl(struct dentry *dentry, const char *name, 
		return PTR_ERR(acl);

	if (acl == NULL)

		return -ENODATA;

	error = posix_acl_to_xattr(acl, buffer, size);

	error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);

	posix_acl_release(acl);



	return error;
@@ -304,7 +304,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name, 
		return -EPERM;

	if (value) {

		/* update the cached acl value */

		acl = posix_acl_from_xattr(value, size);

		acl = posix_acl_from_xattr(&init_user_ns, value, size);

		if (IS_ERR(acl))

			return PTR_ERR(acl);

		else if (acl) {

fs/btrfs/acl.c

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type) 
		size = __btrfs_getxattr(inode, name, value, size);

	}

	if (size > 0) {

		acl = posix_acl_from_xattr(value, size);

		acl = posix_acl_from_xattr(&init_user_ns, value, size);

	} else if (size == -ENOENT || size == -ENODATA || size == 0) {

		/* FIXME, who returns -ENOENT?  I think nobody */

		acl = NULL;
@@ -91,7 +91,7 @@ static int btrfs_xattr_acl_get(struct dentry *dentry, const char *name, 
		return PTR_ERR(acl);

	if (acl == NULL)

		return -ENODATA;

	ret = posix_acl_to_xattr(acl, value, size);

	ret = posix_acl_to_xattr(&init_user_ns, acl, value, size);

	posix_acl_release(acl);



	return ret;
@@ -141,7 +141,7 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans, 
			goto out;

		}



		ret = posix_acl_to_xattr(acl, value, size);

		ret = posix_acl_to_xattr(&init_user_ns, acl, value, size);

		if (ret < 0)

			goto out;

	}
@@ -169,7 +169,7 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name, 
		return -EOPNOTSUPP;



	if (value) {

		acl = posix_acl_from_xattr(value, size);

		acl = posix_acl_from_xattr(&init_user_ns, value, size);

		if (IS_ERR(acl))

			return PTR_ERR(acl);

fs/ext2/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ ext2_xattr_get_acl(struct dentry *dentry, const char *name, void *buffer, 
		return PTR_ERR(acl);

	if (acl == NULL)

		return -ENODATA;

	error = posix_acl_to_xattr(acl, buffer, size);

	error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);

	posix_acl_release(acl);



	return error;
@@ -371,7 +371,7 @@ ext2_xattr_set_acl(struct dentry *dentry, const char *name, const void *value, 
		return -EPERM;



	if (value) {

		acl = posix_acl_from_xattr(value, size);

		acl = posix_acl_from_xattr(&init_user_ns, value, size);

		if (IS_ERR(acl))

			return PTR_ERR(acl);

		else if (acl) {

fs/ext3/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ ext3_xattr_get_acl(struct dentry *dentry, const char *name, void *buffer, 
		return PTR_ERR(acl);

	if (acl == NULL)

		return -ENODATA;

	error = posix_acl_to_xattr(acl, buffer, size);

	error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);

	posix_acl_release(acl);



	return error;
@@ -392,7 +392,7 @@ ext3_xattr_set_acl(struct dentry *dentry, const char *name, const void *value, 
		return -EPERM;



	if (value) {

		acl = posix_acl_from_xattr(value, size);

		acl = posix_acl_from_xattr(&init_user_ns, value, size);

		if (IS_ERR(acl))

			return PTR_ERR(acl);

		else if (acl) {

fs/ext4/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ ext4_xattr_get_acl(struct dentry *dentry, const char *name, void *buffer, 
		return PTR_ERR(acl);

	if (acl == NULL)

		return -ENODATA;

	error = posix_acl_to_xattr(acl, buffer, size);

	error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);

	posix_acl_release(acl);



	return error;
@@ -397,7 +397,7 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value, 
		return -EPERM;



	if (value) {

		acl = posix_acl_from_xattr(value, size);

		acl = posix_acl_from_xattr(&init_user_ns, value, size);

		if (IS_ERR(acl))

			return PTR_ERR(acl);

		else if (acl) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE