Commit 7352a676 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.7.xattr' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs xattr updates from Christian Brauner:
 "The 's_xattr' field of 'struct super_block' currently requires a
  mutable table of 'struct xattr_handler' entries (although each handler
  itself is const). However, no code in vfs actually modifies the
  tables.

  This changes the type of 's_xattr' to allow const tables, and modifies
  existing file systems to move their tables to .rodata. This is
  desirable because these tables contain entries with function pointers
  in them; moving them to .rodata makes it considerably less likely to
  be modified accidentally or maliciously at runtime"

* tag 'vfs-6.7.xattr' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs: (30 commits)
  const_structs.checkpatch: add xattr_handler
  net: move sockfs_xattr_handlers to .rodata
  shmem: move shmem_xattr_handlers to .rodata
  overlayfs: move xattr tables to .rodata
  xfs: move xfs_xattr_handlers to .rodata
  ubifs: move ubifs_xattr_handlers to .rodata
  squashfs: move squashfs_xattr_handlers to .rodata
  smb: move cifs_xattr_handlers to .rodata
  reiserfs: move reiserfs_xattr_handlers to .rodata
  orangefs: move orangefs_xattr_handlers to .rodata
  ocfs2: move ocfs2_xattr_handlers and ocfs2_xattr_handler_map to .rodata
  ntfs3: move ntfs_xattr_handlers to .rodata
  nfs: move nfs4_xattr_handlers to .rodata
  kernfs: move kernfs_xattr_handlers to .rodata
  jfs: move jfs_xattr_handlers to .rodata
  jffs2: move jffs2_xattr_handlers to .rodata
  hfsplus: move hfsplus_xattr_handlers to .rodata
  hfs: move hfs_xattr_handlers to .rodata
  gfs2: move gfs2_xattr_handlers_max to .rodata
  fuse: move fuse_xattr_handlers to .rodata
  ...
parents df9c65b5 a640d888

fs/9p/xattr.c

+4 −4
Original line number Diff line number Diff line
@@ -162,27 +162,27 @@ static int v9fs_xattr_handler_set(const struct xattr_handler *handler, 
	return v9fs_xattr_set(dentry, full_name, value, size, flags);

}



static struct xattr_handler v9fs_xattr_user_handler = {

static const struct xattr_handler v9fs_xattr_user_handler = {

	.prefix	= XATTR_USER_PREFIX,

	.get	= v9fs_xattr_handler_get,

	.set	= v9fs_xattr_handler_set,

};



static struct xattr_handler v9fs_xattr_trusted_handler = {

static const struct xattr_handler v9fs_xattr_trusted_handler = {

	.prefix	= XATTR_TRUSTED_PREFIX,

	.get	= v9fs_xattr_handler_get,

	.set	= v9fs_xattr_handler_set,

};



#ifdef CONFIG_9P_FS_SECURITY

static struct xattr_handler v9fs_xattr_security_handler = {

static const struct xattr_handler v9fs_xattr_security_handler = {

	.prefix	= XATTR_SECURITY_PREFIX,

	.get	= v9fs_xattr_handler_get,

	.set	= v9fs_xattr_handler_set,

};

#endif



const struct xattr_handler *v9fs_xattr_handlers[] = {

const struct xattr_handler * const v9fs_xattr_handlers[] = {

	&v9fs_xattr_user_handler,

	&v9fs_xattr_trusted_handler,

#ifdef CONFIG_9P_FS_SECURITY

fs/9p/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <net/9p/9p.h>

#include <net/9p/client.h>



extern const struct xattr_handler *v9fs_xattr_handlers[];

extern const struct xattr_handler * const v9fs_xattr_handlers[];



ssize_t v9fs_fid_xattr_get(struct p9_fid *fid, const char *name,

			   void *buffer, size_t buffer_size);

fs/afs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -1541,7 +1541,7 @@ int afs_launder_folio(struct folio *); 
/*

 * xattr.c

 */

extern const struct xattr_handler *afs_xattr_handlers[];

extern const struct xattr_handler * const afs_xattr_handlers[];



/*

 * yfsclient.c

fs/afs/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static const struct xattr_handler afs_xattr_afs_volume_handler = { 
	.get	= afs_xattr_get_volume,

};



const struct xattr_handler *afs_xattr_handlers[] = {

const struct xattr_handler * const afs_xattr_handlers[] = {

	&afs_xattr_afs_acl_handler,

	&afs_xattr_afs_cell_handler,

	&afs_xattr_afs_fid_handler,

fs/btrfs/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static const struct xattr_handler btrfs_btrfs_xattr_handler = { 
	.set = btrfs_xattr_handler_set_prop,

};



const struct xattr_handler *btrfs_xattr_handlers[] = {

const struct xattr_handler * const btrfs_xattr_handlers[] = {

	&btrfs_security_xattr_handler,

	&btrfs_trusted_xattr_handler,

	&btrfs_user_xattr_handler,