squashfs/squashfs-tools: Add posix acl support
Subsystems (3)
v5 cover squashfs/squashfs-tools: Add posix acl support
When we use mksquashfs tool to create a squashfs image from the files which have POSIX ACLs(Access Control Lists), we get these errors:
Unrecognised xattr prefix system.posix_acl_access Unrecognised xattr prefix system.posix_acl_default
This patcheset adds posix acl support to squashfs to fix this problem. Patch #1 for kerenl tree and patch #2 for squashfs-tools tree.
---
Testcase:
$ mkdir root $ getfacl root # file: root # owner: tgl # group: tgl user::rwx group::r-x other::r-x $ setfacl -m u:tgl:rw root $ setfacl -m d:tgl:rw root $ getfacl root # file: root # owner: tgl # group: tgl user::rwx user:tgl:rw- group::r-x mask::rwx other::r-x default:user::rwx default:user:tgl:rw- default:group::r-x default:mask::rwx default:other::r-x $ getfattr -m . -d root # file: root system.posix_acl_access=0sAgAAAAEABwD/////AgAGAOgDAAAEAAUA/////xAABwD/////IAAFAP////8= system.posix_acl_default=0sAgAAAAEABwD/////AgAGAOgDAAAEAAUA/////xAABwD/////IAAFAP////8=
$ mksquashfs root root.img $ sudo mount root.img /mnt/squash/
$ cd /mnt $ getfacl squash # file: squash # owner: tgl # group: tgl user::rwx user:tgl:rw- group::r-x mask::rwx other::r-x default:user::rwx default:user:tgl:rw- default:group::r-x default:mask::rwx default:other::r-x $ getfattr -m . -d squash # file: squash system.posix_acl_access=0sAgAAAAEABwD/////AgAGAOgDAAAEAAUA/////xAABwD/////IAAFAP////8= system.posix_acl_default=0sAgAAAAEABwD/////AgAGAOgDAAAEAAUA/////xAABwD/////IAAFAP////8=
---
Geliang Tang (1):
squashfs: Add posix acl support
Documentation/filesystems/squashfs.txt | 2 - fs/squashfs/Kconfig | 11 +++++ fs/squashfs/Makefile | 1 + fs/squashfs/acl.c | 56 ++++++++++++++++++++++++++ fs/squashfs/acl.h | 18 +++++++++ fs/squashfs/inode.c | 4 +- fs/squashfs/namei.c | 6 ++- fs/squashfs/squashfs_fs.h | 12 +++--- fs/squashfs/super.c | 3 ++ fs/squashfs/symlink.c | 6 ++- fs/squashfs/xattr.c | 31 +++++++++++++- fs/squashfs/xattr.h | 8 ++++ 12 files changed, 145 insertions(+), 13 deletions(-) create mode 100644 fs/squashfs/acl.c create mode 100644 fs/squashfs/acl.h
---
Geliang Tang (1):
squashfs-tools: Add posix acl support
squashfs-tools/read_xattrs.c | 2 ++ squashfs-tools/squashfs_fs.h | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
PATCH v5 1/2 squashfs: Add posix acl support
Add posix acl (Access Control Lists) support for squashfs, which is marked as a todo item in squashfs documentation. This patch implements a squashfs_get_acl function to read the file's acl information from its xattr lists.
---
Changes in v5:
- add SPDX lines.
--- Documentation/filesystems/squashfs.txt | 2 - fs/squashfs/Kconfig | 11 +++++ fs/squashfs/Makefile | 1 + fs/squashfs/acl.c | 56 ++++++++++++++++++++++++++ fs/squashfs/acl.h | 18 +++++++++ fs/squashfs/inode.c | 4 +- fs/squashfs/namei.c | 6 ++- fs/squashfs/squashfs_fs.h | 12 +++--- fs/squashfs/super.c | 3 ++ fs/squashfs/symlink.c | 6 ++- fs/squashfs/xattr.c | 31 +++++++++++++- fs/squashfs/xattr.h | 8 ++++ 12 files changed, 145 insertions(+), 13 deletions(-) create mode 100644 fs/squashfs/acl.c create mode 100644 fs/squashfs/acl.h
Documentation/filesystems/squashfs.txt +0 -2
@@ -235,8 +235,6 @@ list using a second xattr id lookup table. 4.1 Todo list ------------- -Implement ACL support. - 4.2 Squashfs internal cache ---------------------------
fs/squashfs/Kconfig +11 -0
@@ -107,6 +107,17 @@ config SQUASHFS_XATTR If unsure, say N. +config SQUASHFS_POSIX_ACL + bool "Squashfs POSIX ACL support" + depends on SQUASHFS_XATTR + select FS_POSIX_ACL + help + Saying Y here includes support for Access Control Lists (acls). + Acls are used to define more fine-grained discretionary access + rights for files and directories (see the acl(5) manual page). + + If unsure, say N. + config SQUASHFS_ZLIB bool "Include support for ZLIB compressed file systems" depends on SQUASHFS
fs/squashfs/Makefile +1 -0
@@ -12,6 +12,7 @@ squashfs-$(CONFIG_SQUASHFS_DECOMP_SINGLE) += decompressor_single.o squashfs-$(CONFIG_SQUASHFS_DECOMP_MULTI) += decompressor_multi.o squashfs-$(CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU) += decompressor_multi_percpu.o squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o +squashfs-$(CONFIG_SQUASHFS_POSIX_ACL) += acl.o squashfs-$(CONFIG_SQUASHFS_LZ4) += lz4_wrapper.o squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o squashfs-$(CONFIG_SQUASHFS_XZ) += xz_wrapper.o
fs/squashfs/acl.c new file +56 -0
56 lines not on this page · raw message
fs/squashfs/acl.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Squashfs - a compressed read only filesystem for Linux +* +* Copyright (c) 2019 +* Geliang Tang <[email protected]> +* +* acl.h +*/ + +#include <linux/fs.h> +#include <linux/posix_acl_xattr.h> + +#ifdef CONFIG_SQUASHFS_POSIX_ACL +extern struct posix_acl *squashfs_get_acl (struct inode *inode,int type); +#else +#define squashfs_get_acl NULL +#endif
fs/squashfs/inode.c +3 -1
@@ -48,6 +48,7 @@#include "squashfs_fs_i.h" #include "squashfs.h" #include "xattr.h" +#include "acl.h" /* * Initialise VFS inode with the base inode information common to all
@@ -425,6 +426,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)const struct inode_operations squashfs_inode_ops = { - .listxattr = squashfs_listxattr + .listxattr = squashfs_listxattr, + .get_acl = squashfs_get_acl };
fs/squashfs/namei.c +4 -2
@@ -64,6 +64,7 @@#include "squashfs_fs_i.h" #include "squashfs.h" #include "xattr.h" +#include "acl.h" /* * Lookup name in the directory index, returning the location of the metadata
@@ -246,6 +247,7 @@ static struct dentry *squashfs_lookup(struct inode *dir, struct dentry *dentry,const struct inode_operations squashfs_dir_inode_ops = { - .lookup = squashfs_lookup, - .listxattr = squashfs_listxattr + .lookup = squashfs_lookup, + .listxattr = squashfs_listxattr, + .get_acl = squashfs_get_acl };
fs/squashfs/squashfs_fs.h +7 -5
@@ -107,11 +107,13 @@#define SQUASHFS_MAX_DIR_TYPE 7/* Xattr types */ -#define SQUASHFS_XATTR_USER 0 -#define SQUASHFS_XATTR_TRUSTED 1 -#define SQUASHFS_XATTR_SECURITY 2 -#define SQUASHFS_XATTR_VALUE_OOL 256 -#define SQUASHFS_XATTR_PREFIX_MASK 0xff +#define SQUASHFS_XATTR_USER 0 +#define SQUASHFS_XATTR_POSIX_ACL_ACCESS 1 +#define SQUASHFS_XATTR_POSIX_ACL_DEFAULT 2 +#define SQUASHFS_XATTR_TRUSTED 3 +#define SQUASHFS_XATTR_SECURITY 4 +#define SQUASHFS_XATTR_VALUE_OOL 256 +#define SQUASHFS_XATTR_PREFIX_MASK 0xff/* Flag whether block is compressed or uncompressed, bit is set if block is * uncompressed */
fs/squashfs/super.c +3 -0
@@ -197,6 +197,9 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) sb->s_maxbytes =MAX_LFS_FILESIZE ; sb->s_flags |=SB_RDONLY ; +#ifdef CONFIG_SQUASHFS_POSIX_ACL + sb->s_flags |=SB_POSIXACL ; +#endif sb->s_op = &squashfs_super_ops; err = -ENOMEM ;
fs/squashfs/symlink.c +4 -2
@@ -42,6 +42,7 @@#include "squashfs_fs_i.h" #include "squashfs.h" #include "xattr.h" +#include "acl.h" static int squashfs_symlink_readpage (struct file *file,struct page *page) {
@@ -118,7 +119,8 @@ const struct address_space_operations squashfs_symlink_aops = { };const struct inode_operations squashfs_symlink_inode_ops = { - .get_link = page_get_link, - .listxattr = squashfs_listxattr + .get_link = page_get_link, + .listxattr = squashfs_listxattr, + .get_acl = squashfs_get_acl };
fs/squashfs/xattr.c +30 -1
@@ -33,6 +33,7 @@#include "squashfs_fs_sb.h" #include "squashfs_fs_i.h" #include "squashfs.h" +#include "acl.h" static const struct xattr_handler *squashfs_xattr_handler (int );
@@ -115,7 +116,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer, } -static int squashfs_xattr_get (struct inode *inode,int name_index, +int squashfs_xattr_get (struct inode *inode,int name_index,const char *name,void *buffer,size_t buffer_size) {struct super_block *sb = inode->i_sb;
@@ -232,6 +233,24 @@ static const struct xattr_handler squashfs_xattr_user_handler = { .get = squashfs_xattr_handler_get }; +/* +* ACL access namespace support +*/ +static const struct xattr_handler squashfs_xattr_acl_access_handler = { + .prefix =XATTR_SYSTEM_PREFIX , + .flags =SQUASHFS_XATTR_POSIX_ACL_ACCESS , + .get = squashfs_xattr_handler_get +}; + +/* +* ACL default namespace support +*/ +static const struct xattr_handler squashfs_xattr_acl_default_handler = { + .prefix =XATTR_SYSTEM_PREFIX , + .flags =SQUASHFS_XATTR_POSIX_ACL_DEFAULT , + .get = squashfs_xattr_handler_get +}; +/* * Trusted namespace support */
@@ -265,6 +284,12 @@ static const struct xattr_handler *squashfs_xattr_handler(int type)switch (type &SQUASHFS_XATTR_PREFIX_MASK ) {case SQUASHFS_XATTR_USER :return &squashfs_xattr_user_handler; +#ifdef CONFIG_SQUASHFS_POSIX_ACL +case SQUASHFS_XATTR_POSIX_ACL_ACCESS : +return &squashfs_xattr_acl_access_handler; +case SQUASHFS_XATTR_POSIX_ACL_DEFAULT : +return &squashfs_xattr_acl_default_handler; +#endif case SQUASHFS_XATTR_TRUSTED :return &squashfs_xattr_trusted_handler;case SQUASHFS_XATTR_SECURITY :
@@ -277,6 +302,10 @@ static const struct xattr_handler *squashfs_xattr_handler(int type)const struct xattr_handler *squashfs_xattr_handlers[] = { &squashfs_xattr_user_handler, +#ifdef CONFIG_SQUASHFS_POSIX_ACL + &squashfs_xattr_acl_access_handler, + &squashfs_xattr_acl_default_handler, +#endif &squashfs_xattr_trusted_handler, &squashfs_xattr_security_handler,NULL
fs/squashfs/xattr.h +8 -0
@@ -26,6 +26,8 @@ extern __le64 *squashfs_read_xattr_id_table(struct super_block *, u64, u64 *, int *);extern int squashfs_xattr_lookup (struct super_block *,unsigned int ,int *,unsigned int *,unsigned long long *); +extern int squashfs_xattr_get (struct inode *inode,int name_index, +const char *name,void *buffer,size_t buffer_size);#else static inline __le64 *squashfs_read_xattr_id_table (struct super_block *sb,u64 start,u64 *xattr_table_start,int *xattr_ids)
@@ -41,6 +43,12 @@ static inline int squashfs_xattr_lookup(struct super_block *sb, {return 0 ; } + +static int squashfs_xattr_get (struct inode *inode,int name_index, +const char *name,void *buffer,size_t buffer_size) +{ +return 0 ; +}#define squashfs_listxattr NULL#define squashfs_xattr_handlers NULL#endif
Signature · 1 line
2.17.1
PATCH v5 2/2 squashfs-tools: Add posix acl support
In reply to Geliang TangThis patch adds posix acl (Access Control Lists) support to squashfs-tools.
--- squashfs-tools/read_xattrs.c | 2 ++ squashfs-tools/squashfs_fs.h | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-)
squashfs-tools/read_xattrs.c +2 -0
@@ -64,6 +64,8 @@ static long long xattr_table_start;*/ struct prefix prefix_table[] = { {"user." ,SQUASHFS_XATTR_USER }, + {"system." ,SQUASHFS_XATTR_POSIX_ACL_ACCESS }, + {"system." ,SQUASHFS_XATTR_POSIX_ACL_DEFAULT }, {"trusted." ,SQUASHFS_XATTR_TRUSTED }, {"security." ,SQUASHFS_XATTR_SECURITY }, {"" ,-1 }
squashfs-tools/squashfs_fs.h +7 -5
@@ -122,11 +122,13 @@#define SQUASHFS_LSOCKET_TYPE 14/* Xattr types */ -#define SQUASHFS_XATTR_USER 0 -#define SQUASHFS_XATTR_TRUSTED 1 -#define SQUASHFS_XATTR_SECURITY 2 -#define SQUASHFS_XATTR_VALUE_OOL 256 -#define SQUASHFS_XATTR_PREFIX_MASK 0xff +#define SQUASHFS_XATTR_USER 0 +#define SQUASHFS_XATTR_POSIX_ACL_ACCESS 1 +#define SQUASHFS_XATTR_POSIX_ACL_DEFAULT 2 +#define SQUASHFS_XATTR_TRUSTED 3 +#define SQUASHFS_XATTR_SECURITY 4 +#define SQUASHFS_XATTR_VALUE_OOL 256 +#define SQUASHFS_XATTR_PREFIX_MASK 0xff/* Flag whether block is compressed or uncompressed, bit is set if block is * uncompressed */
Signature · 1 line
2.17.1