Unverified Commit 3591f40e authored by Wedson Almeida Filho's avatar Wedson Almeida Filho Committed by Christian Brauner
Browse files

erofs: move erofs_xattr_handlers and xattr_handler_map to .rodata 



This makes it harder for accidental or malicious changes to
erofs_xattr_handlers or xattr_handler_map at runtime.

Cc: Gao Xiang <xiang@kernel.org>
Cc: Chao Yu <chao@kernel.org>
Cc: Yue Hu <huyue2@coolpad.com>
Cc: Jeffle Xu <jefflexu@linux.alibaba.com>
Cc: linux-erofs@lists.ozlabs.org
Signed-off-by: default avatarWedson Almeida Filho <walmeida@microsoft.com>
Link: https://lore.kernel.org/r/20230930050033.41174-9-wedsonaf@gmail.com


Acked-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent f354ed98

fs/erofs/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ const struct xattr_handler __maybe_unused erofs_xattr_security_handler = { 
};

#endif



const struct xattr_handler *erofs_xattr_handlers[] = {

const struct xattr_handler * const erofs_xattr_handlers[] = {

	&erofs_xattr_user_handler,

	&erofs_xattr_trusted_handler,

#ifdef CONFIG_EROFS_FS_SECURITY

fs/erofs/xattr.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static inline const char *erofs_xattr_prefix(unsigned int idx, 
{

	const struct xattr_handler *handler = NULL;



	static const struct xattr_handler *xattr_handler_map[] = {

	static const struct xattr_handler * const xattr_handler_map[] = {

		[EROFS_XATTR_INDEX_USER] = &erofs_xattr_user_handler,

#ifdef CONFIG_EROFS_FS_POSIX_ACL

		[EROFS_XATTR_INDEX_POSIX_ACL_ACCESS] = &nop_posix_acl_access,
@@ -44,7 +44,7 @@ static inline const char *erofs_xattr_prefix(unsigned int idx, 
	return xattr_prefix(handler);

}



extern const struct xattr_handler *erofs_xattr_handlers[];

extern const struct xattr_handler * const erofs_xattr_handlers[];



int erofs_xattr_prefixes_init(struct super_block *sb);

void erofs_xattr_prefixes_cleanup(struct super_block *sb);