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

Commit 6abbd53f authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Sasha Levin
Browse files

posix_acl: Add set_posix_acl 



[ Upstream commit 485e71e8fb6356c08c7fc6bcce4bf02c9a9a663f ]

Factor out part of posix_acl_xattr_set into a common function that takes
a posix_acl, which nfsd can also call.

The prototype already exists in include/linux/posix_acl.h.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Cc: stable@vger.kernel.org
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 4f143eb4

fs/posix_acl.c

+21 −17
Original line number Diff line number Diff line
@@ -787,38 +787,42 @@ posix_acl_xattr_get(struct dentry *dentry, const char *name, 
	return error;

}



static int

posix_acl_xattr_set(struct dentry *dentry, const char *name,

		const void *value, size_t size, int flags, int type)

int

set_posix_acl(struct inode *inode, int type, struct posix_acl *acl)

{

	struct inode *inode = dentry->d_inode;

	struct posix_acl *acl = NULL;

	int ret;



	if (!IS_POSIXACL(inode))

		return -EOPNOTSUPP;

	if (!inode->i_op->set_acl)

		return -EOPNOTSUPP;



	if (type == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))

		return value ? -EACCES : 0;

		return acl ? -EACCES : 0;

	if (!inode_owner_or_capable(inode))

		return -EPERM;



	if (value) {

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

		if (IS_ERR(acl))

			return PTR_ERR(acl);



	if (acl) {

			ret = posix_acl_valid(acl);

		int ret = posix_acl_valid(acl);

		if (ret)

				goto out;

			return ret;

	}

	return inode->i_op->set_acl(inode, acl, type);

}

EXPORT_SYMBOL(set_posix_acl);



	ret = inode->i_op->set_acl(inode, acl, type);

out:

static int

posix_acl_xattr_set(struct dentry *dentry, const char *name,

		const void *value, size_t size, int flags, int type)

{

	struct inode *inode = dentry->d_inode;

	struct posix_acl *acl = NULL;

	int ret;



	if (value) {

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

		if (IS_ERR(acl))

			return PTR_ERR(acl);

	}

	ret = set_posix_acl(inode, type, acl);

	posix_acl_release(acl);

	return ret;

}