Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

linux 6.3 compat changes for truenas/zfs-2.2-release 

Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
This commit is contained in:
Ameer Hamza 2023-06-27 23:24:39 +05:00
parent 343164faac
commit 50f9fd6fce
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/os/linux/zfs/sys/zpl.h
View File

@ -109,6 +109,8 @@ zpl_chmod_acl(struct inode *ip)
#if defined(HAVE_IOPS_PERMISSION_USERNS) #if defined(HAVE_IOPS_PERMISSION_USERNS)
extern int zpl_permission(struct user_namespace *userns, struct inode *ip, extern int zpl_permission(struct user_namespace *userns, struct inode *ip,
int mask); int mask);
#elif defined(HAVE_IOPS_PERMISSION_IDMAP)
extern int zpl_permission(struct mnt_idmap *idmap, struct inode *ip, int mask);
#else #else
extern int zpl_permission(struct inode *ip, int mask); extern int zpl_permission(struct inode *ip, int mask);
#endif #endif

2
module/os/linux/zfs/policy.c
View File

@ -123,7 +123,7 @@ secpolicy_vnode_access2(const cred_t *cr, struct inode *ip, uid_t owner,
if ((uid == owner) || (uid == 0)) if ((uid == owner) || (uid == 0))
return (0); return (0);
if (zpl_inode_owner_or_capable(kcred->user_ns, ip)) if (zpl_inode_owner_or_capable(zfs_init_idmap, ip))
return (0); return (0);
#if defined(CONFIG_USER_NS) #if defined(CONFIG_USER_NS)

12
module/os/linux/zfs/zpl_xattr.c
View File

@ -1499,6 +1499,8 @@ static xattr_handler_t zpl_xattr_acl_default_handler = {
int int
#if defined(HAVE_IOPS_PERMISSION_USERNS) #if defined(HAVE_IOPS_PERMISSION_USERNS)
zpl_permission(struct user_namespace *userns, struct inode *ip, int mask) zpl_permission(struct user_namespace *userns, struct inode *ip, int mask)
#elif defined(HAVE_IOPS_PERMISSION_IDMAP)
zpl_permission(struct mnt_idmap *idmap, struct inode *ip, int mask)
#else #else
zpl_permission(struct inode *ip, int mask) zpl_permission(struct inode *ip, int mask)
#endif #endif
@ -1514,8 +1516,9 @@ zpl_permission(struct inode *ip, int mask)
*/ */
if ((ITOZSB(ip)->z_acl_type != ZFS_ACLTYPE_NFSV4) || if ((ITOZSB(ip)->z_acl_type != ZFS_ACLTYPE_NFSV4) ||
((ITOZ(ip)->z_pflags & ZFS_ACL_TRIVIAL && GENERIC_MASK(mask)))) { ((ITOZ(ip)->z_pflags & ZFS_ACL_TRIVIAL && GENERIC_MASK(mask)))) {
#if defined(HAVE_IOPS_PERMISSION_USERNS) #if (defined(HAVE_IOPS_PERMISSION_USERNS) || \
return (generic_permission(userns, ip, mask)); defined(HAVE_IOPS_PERMISSION_IDMAP))
return (generic_permission(zfs_init_idmap, ip, mask));
#else #else
return (generic_permission(ip, mask)); return (generic_permission(ip, mask));
#endif #endif
@ -1532,8 +1535,9 @@ zpl_permission(struct inode *ip, int mask)
* NFSv4 ACE. Pass back to default kernel permissions check. * NFSv4 ACE. Pass back to default kernel permissions check.
*/ */
if (to_check == 0) { if (to_check == 0) {
#if defined(HAVE_IOPS_PERMISSION_USERNS) #if (defined(HAVE_IOPS_PERMISSION_USERNS) || \
return (generic_permission(userns, ip, mask)); defined(HAVE_IOPS_PERMISSION_IDMAP))
return (generic_permission(zfs_init_idmap, ip, mask));
#else #else
return (generic_permission(ip, mask)); return (generic_permission(ip, mask));
#endif #endif