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

Commit 764a5c6b authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Al Viro
Browse files

xattr handlers: Simplify list operation 



Change the list operation to only return whether or not an attribute
should be listed.  Copying the attribute names into the buffer is moved
to the callers.

Since the result only depends on the dentry and not on the attribute
name, we do not pass the attribute name to list operations.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1046cb11

fs/ext2/xattr.c

+10 −5
Original line number Diff line number Diff line
@@ -292,16 +292,21 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list", 
		const struct xattr_handler *handler =

			ext2_xattr_handler(entry->e_name_index);



		if (handler) {

			size_t size = handler->list(handler, dentry, buffer,

						    rest, entry->e_name,

						    entry->e_name_len);

		if (handler && (!handler->list || handler->list(dentry))) {

			const char *prefix = handler->prefix ?: handler->name;

			size_t prefix_len = strlen(prefix);

			size_t size = prefix_len + entry->e_name_len + 1;



			if (buffer) {

				if (size > rest) {

					error = -ERANGE;

					goto cleanup;

				}

				buffer += size;

				memcpy(buffer, prefix, prefix_len);

				buffer += prefix_len;

				memcpy(buffer, entry->e_name, entry->e_name_len);

				buffer += entry->e_name_len;

				*buffer++ = 0;

			}

			rest -= size;

		}

fs/ext2/xattr_security.c

+0 −17
Original line number Diff line number Diff line
@@ -7,22 +7,6 @@ 
#include <linux/security.h>

#include "xattr.h"



static size_t

ext2_xattr_security_list(const struct xattr_handler *handler,

			 struct dentry *dentry, char *list, size_t list_size,

			 const char *name, size_t name_len)

{

	const int prefix_len = XATTR_SECURITY_PREFIX_LEN;

	const size_t total_len = prefix_len + name_len + 1;



	if (list && total_len <= list_size) {

		memcpy(list, XATTR_SECURITY_PREFIX, prefix_len);

		memcpy(list+prefix_len, name, name_len);

		list[prefix_len + name_len] = '\0';

	}

	return total_len;

}



static int

ext2_xattr_security_get(const struct xattr_handler *handler,

			struct dentry *dentry, const char *name,
@@ -67,7 +51,6 @@ ext2_init_security(struct inode *inode, struct inode *dir, 


const struct xattr_handler ext2_xattr_security_handler = {

	.prefix	= XATTR_SECURITY_PREFIX,

	.list	= ext2_xattr_security_list,

	.get	= ext2_xattr_security_get,

	.set	= ext2_xattr_security_set,

};

fs/ext2/xattr_trusted.c

+3 −16
Original line number Diff line number Diff line
@@ -8,23 +8,10 @@ 
#include "ext2.h"

#include "xattr.h"



static size_t

ext2_xattr_trusted_list(const struct xattr_handler *handler,

			struct dentry *dentry, char *list, size_t list_size,

			const char *name, size_t name_len)

static bool

ext2_xattr_trusted_list(struct dentry *dentry)

{

	const int prefix_len = XATTR_TRUSTED_PREFIX_LEN;

	const size_t total_len = prefix_len + name_len + 1;



	if (!capable(CAP_SYS_ADMIN))

		return 0;



	if (list && total_len <= list_size) {

		memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len);

		memcpy(list+prefix_len, name, name_len);

		list[prefix_len + name_len] = '\0';

	}

	return total_len;

	return capable(CAP_SYS_ADMIN);

}



static int

fs/ext2/xattr_user.c

+3 −16
Original line number Diff line number Diff line
@@ -10,23 +10,10 @@ 
#include "ext2.h"

#include "xattr.h"



static size_t

ext2_xattr_user_list(const struct xattr_handler *handler,

		     struct dentry *dentry, char *list, size_t list_size,

		     const char *name, size_t name_len)

static bool

ext2_xattr_user_list(struct dentry *dentry)

{

	const size_t prefix_len = XATTR_USER_PREFIX_LEN;

	const size_t total_len = prefix_len + name_len + 1;



	if (!test_opt(dentry->d_sb, XATTR_USER))

		return 0;



	if (list && total_len <= list_size) {

		memcpy(list, XATTR_USER_PREFIX, prefix_len);

		memcpy(list+prefix_len, name, name_len);

		list[prefix_len + name_len] = '\0';

	}

	return total_len;

	return test_opt(dentry->d_sb, XATTR_USER);

}



static int

fs/ext4/xattr.c

+11 −6
Original line number Diff line number Diff line
@@ -404,19 +404,24 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry, 
		const struct xattr_handler *handler =

			ext4_xattr_handler(entry->e_name_index);



		if (handler) {

			size_t size = handler->list(handler, dentry, buffer,

						    rest, entry->e_name,

						    entry->e_name_len);

		if (handler && (!handler->list || handler->list(dentry))) {

			const char *prefix = handler->prefix ?: handler->name;

			size_t prefix_len = strlen(prefix);

			size_t size = prefix_len + entry->e_name_len + 1;



			if (buffer) {

				if (size > rest)

					return -ERANGE;

				buffer += size;

				memcpy(buffer, prefix, prefix_len);

				buffer += prefix_len;

				memcpy(buffer, entry->e_name, entry->e_name_len);

				buffer += entry->e_name_len;

				*buffer++ = 0;

			}

			rest -= size;

		}

	}

	return buffer_size - rest;

	return buffer_size - rest;  /* total size */

}



static int