Unverified Commit 2cba9af9 authored by Wedson Almeida Filho's avatar Wedson Almeida Filho Committed by Christian Brauner
Browse files

ocfs2: move ocfs2_xattr_handlers and ocfs2_xattr_handler_map to .rodata 



This makes it harder for accidental or malicious changes to
ocfs2_xattr_handlers or ocfs2_xattr_handler_map at runtime.

Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: ocfs2-devel@lists.linux.dev
Signed-off-by: default avatarWedson Almeida Filho <walmeida@microsoft.com>
Link: https://lore.kernel.org/r/20230930050033.41174-21-wedsonaf@gmail.com


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

fs/ocfs2/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -87,14 +87,14 @@ static struct ocfs2_xattr_def_value_root def_xv = { 
	.xv.xr_list.l_count = cpu_to_le16(1),

};



const struct xattr_handler *ocfs2_xattr_handlers[] = {

const struct xattr_handler * const ocfs2_xattr_handlers[] = {

	&ocfs2_xattr_user_handler,

	&ocfs2_xattr_trusted_handler,

	&ocfs2_xattr_security_handler,

	NULL

};



static const struct xattr_handler *ocfs2_xattr_handler_map[OCFS2_XATTR_MAX] = {

static const struct xattr_handler * const ocfs2_xattr_handler_map[OCFS2_XATTR_MAX] = {

	[OCFS2_XATTR_INDEX_USER]		= &ocfs2_xattr_user_handler,

	[OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS]	= &nop_posix_acl_access,

	[OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT]	= &nop_posix_acl_default,

fs/ocfs2/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct ocfs2_security_xattr_info { 
extern const struct xattr_handler ocfs2_xattr_user_handler;

extern const struct xattr_handler ocfs2_xattr_trusted_handler;

extern const struct xattr_handler ocfs2_xattr_security_handler;

extern const struct xattr_handler *ocfs2_xattr_handlers[];

extern const struct xattr_handler * const ocfs2_xattr_handlers[];



ssize_t ocfs2_listxattr(struct dentry *, char *, size_t);

int ocfs2_xattr_get_nolock(struct inode *, struct buffer_head *, int,