Unverified Commit 6cbfdf89 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Christian Brauner
Browse files

posix_acl: make posix_acl_to_xattr() alloc the buffer 



Without exception all caller do that.  So move the allocation into the
helper.

This reduces boilerplate and removes unnecessary error checking.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Link: https://patch.msgid.link/20260115122341.556026-1-mszeredi@redhat.com


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 88ec797c

fs/9p/acl.c

+3 −13
Original line number Diff line number Diff line
@@ -167,17 +167,11 @@ int v9fs_iop_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
		if (retval)

			goto err_out;



		size = posix_acl_xattr_size(acl->a_count);



		value = kzalloc(size, GFP_NOFS);

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

		if (!value) {

			retval = -ENOMEM;

			goto err_out;

		}



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

		if (retval < 0)

			goto err_out;

	}



	/*
@@ -257,13 +251,10 @@ static int v9fs_set_acl(struct p9_fid *fid, int type, struct posix_acl *acl) 
		return 0;



	/* Set a setxattr request to server */

	size = posix_acl_xattr_size(acl->a_count);

	buffer = kmalloc(size, GFP_KERNEL);

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

	if (!buffer)

		return -ENOMEM;

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

	if (retval < 0)

		goto err_free_out;



	switch (type) {

	case ACL_TYPE_ACCESS:

		name = XATTR_NAME_POSIX_ACL_ACCESS;
@@ -275,7 +266,6 @@ static int v9fs_set_acl(struct p9_fid *fid, int type, struct posix_acl *acl) 
		BUG();

	}

	retval = v9fs_fid_xattr_set(fid, name, buffer, size, 0);

err_free_out:

	kfree(buffer);

	return retval;

}

fs/btrfs/acl.c

+3 −7
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu) 
int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode,

		    struct posix_acl *acl, int type)

{

	int ret, size = 0;

	int ret;

	size_t size = 0;

	const char *name;

	char AUTO_KFREE(value);
@@ -77,20 +78,15 @@ int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode, 
	if (acl) {

		unsigned int nofs_flag;



		size = posix_acl_xattr_size(acl->a_count);

		/*

		 * We're holding a transaction handle, so use a NOFS memory

		 * allocation context to avoid deadlock if reclaim happens.

		 */

		nofs_flag = memalloc_nofs_save();

		value = kmalloc(size, GFP_KERNEL);

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

		memalloc_nofs_restore(nofs_flag);

		if (!value)

			return -ENOMEM;



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

		if (ret < 0)

			return ret;

	}



	if (trans)

fs/ceph/acl.c

+22 −28
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu) 
int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

		 struct posix_acl *acl, int type)

{

	int ret = 0, size = 0;

	int ret = 0;

	size_t size = 0;

	const char *name = NULL;

	char *value = NULL;

	struct iattr newattrs;
@@ -126,16 +127,11 @@ int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
	}



	if (acl) {

		size = posix_acl_xattr_size(acl->a_count);

		value = kmalloc(size, GFP_NOFS);

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

		if (!value) {

			ret = -ENOMEM;

			goto out;

		}



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

		if (ret < 0)

			goto out_free;

	}



	if (new_mode != old_mode) {
@@ -172,7 +168,7 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode, 
	struct posix_acl *acl, *default_acl;

	size_t val_size1 = 0, val_size2 = 0;

	struct ceph_pagelist *pagelist = NULL;

	void *tmp_buf = NULL;

	void *tmp_buf1 = NULL, *tmp_buf2 = NULL;

	int err;



	err = posix_acl_create(dir, mode, &default_acl, &acl);
@@ -192,15 +188,7 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode, 
	if (!default_acl && !acl)

		return 0;



	if (acl)

		val_size1 = posix_acl_xattr_size(acl->a_count);

	if (default_acl)

		val_size2 = posix_acl_xattr_size(default_acl->a_count);



	err = -ENOMEM;

	tmp_buf = kmalloc(max(val_size1, val_size2), GFP_KERNEL);

	if (!tmp_buf)

		goto out_err;

	pagelist = ceph_pagelist_alloc(GFP_KERNEL);

	if (!pagelist)

		goto out_err;
@@ -213,34 +201,39 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode, 


	if (acl) {

		size_t len = strlen(XATTR_NAME_POSIX_ACL_ACCESS);



		err = -ENOMEM;

		tmp_buf1 = posix_acl_to_xattr(&init_user_ns, acl,

					      &val_size1, GFP_KERNEL);

		if (!tmp_buf1)

			goto out_err;

		err = ceph_pagelist_reserve(pagelist, len + val_size1 + 8);

		if (err)

			goto out_err;

		ceph_pagelist_encode_string(pagelist, XATTR_NAME_POSIX_ACL_ACCESS,

					    len);

		err = posix_acl_to_xattr(&init_user_ns, acl,

					 tmp_buf, val_size1);

		if (err < 0)

			goto out_err;

		ceph_pagelist_encode_32(pagelist, val_size1);

		ceph_pagelist_append(pagelist, tmp_buf, val_size1);

		ceph_pagelist_append(pagelist, tmp_buf1, val_size1);

	}

	if (default_acl) {

		size_t len = strlen(XATTR_NAME_POSIX_ACL_DEFAULT);



		err = -ENOMEM;

		tmp_buf2 = posix_acl_to_xattr(&init_user_ns, default_acl,

					      &val_size2, GFP_KERNEL);

		if (!tmp_buf2)

			goto out_err;

		err = ceph_pagelist_reserve(pagelist, len + val_size2 + 8);

		if (err)

			goto out_err;

		ceph_pagelist_encode_string(pagelist,

					  XATTR_NAME_POSIX_ACL_DEFAULT, len);

		err = posix_acl_to_xattr(&init_user_ns, default_acl,

					 tmp_buf, val_size2);

		if (err < 0)

			goto out_err;

		ceph_pagelist_encode_32(pagelist, val_size2);

		ceph_pagelist_append(pagelist, tmp_buf, val_size2);

		ceph_pagelist_append(pagelist, tmp_buf2, val_size2);

	}



	kfree(tmp_buf);

	kfree(tmp_buf1);

	kfree(tmp_buf2);



	as_ctx->acl = acl;

	as_ctx->default_acl = default_acl;
@@ -250,7 +243,8 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode, 
out_err:

	posix_acl_release(acl);

	posix_acl_release(default_acl);

	kfree(tmp_buf);

	kfree(tmp_buf1);

	kfree(tmp_buf2);

	if (pagelist)

		ceph_pagelist_release(pagelist);

	return err;

fs/fuse/acl.c

+4 −8
Original line number Diff line number Diff line
@@ -122,20 +122,16 @@ int fuse_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
		 * them to be refreshed the next time they are used,

		 * and it also updates i_ctime.

		 */

		size_t size = posix_acl_xattr_size(acl->a_count);

		size_t size;

		void *value;



		if (size > PAGE_SIZE)

			return -E2BIG;



		value = kmalloc(size, GFP_KERNEL);

		value = posix_acl_to_xattr(fc->user_ns, acl, &size, GFP_KERNEL);

		if (!value)

			return -ENOMEM;



		ret = posix_acl_to_xattr(fc->user_ns, acl, value, size);

		if (ret < 0) {

		if (size > PAGE_SIZE) {

			kfree(value);

			return ret;

			return -E2BIG;

		}



		/*

fs/gfs2/acl.c

+3 −10
Original line number Diff line number Diff line
@@ -83,21 +83,14 @@ struct posix_acl *gfs2_get_acl(struct inode *inode, int type, bool rcu) 
int __gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)

{

	int error;

	size_t len;

	char *data;

	size_t len = 0;

	char *data = NULL;

	const char *name = gfs2_acl_name(type);



	if (acl) {

		len = posix_acl_xattr_size(acl->a_count);

		data = kmalloc(len, GFP_NOFS);

		data = posix_acl_to_xattr(&init_user_ns, acl, &len, GFP_NOFS);

		if (data == NULL)

			return -ENOMEM;

		error = posix_acl_to_xattr(&init_user_ns, acl, data, len);

		if (error < 0)

			goto out;

	} else {

		data = NULL;

		len = 0;

	}



	error = __gfs2_xattr_set(inode, name, data, len, 0, GFS2_EATYPE_SYS);