diff options
| author | Matthew Macy <[email protected]> | 2020-08-18 09:57:07 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-18 09:57:07 -0700 |
| commit | 716b53d0a14c72bda16c0872565dd1909757e73f (patch) | |
| tree | 8a01acc3608712bb8c4947895734a5a92a34db46 /module/zfs | |
| parent | 5e7eaf8fbda348db9878ce013ecb4ab5e9b5cf5a (diff) | |
FreeBSD: Fix UNIX permissions checking
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #10727
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/zfs_fuid.c | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/module/zfs/zfs_fuid.c b/module/zfs/zfs_fuid.c index 726b923fa..015dde481 100644 --- a/module/zfs/zfs_fuid.c +++ b/module/zfs/zfs_fuid.c @@ -387,11 +387,34 @@ zfs_fuid_map_ids(znode_t *zp, cred_t *cr, uid_t *uidp, uid_t *gidp) cr, ZFS_GROUP); } +#ifdef __FreeBSD__ +uid_t +zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid, + cred_t *cr, zfs_fuid_type_t type) +{ + uint32_t index = FUID_INDEX(fuid); + + if (index == 0) + return (fuid); + + return (UID_NOBODY); +} +#elif defined(__linux__) +uid_t +zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid, + cred_t *cr, zfs_fuid_type_t type) +{ + /* + * The Linux port only supports POSIX IDs, use the passed id. + */ + return (fuid); +} + +#else uid_t zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid, cred_t *cr, zfs_fuid_type_t type) { -#ifdef HAVE_KSID uint32_t index = FUID_INDEX(fuid); const char *domain; uid_t id; @@ -410,13 +433,8 @@ zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid, FUID_RID(fuid), &id); } return (id); -#else - /* - * The Linux port only supports POSIX IDs, use the passed id. - */ - return (fuid); -#endif /* HAVE_KSID */ } +#endif /* * Add a FUID node to the list of fuid's being created for this @@ -559,9 +577,9 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr, const char *domain; char *kdomain; uint32_t fuid_idx = FUID_INDEX(id); - uint32_t rid; + uint32_t rid = 0; idmap_stat status; - uint64_t idx = 0; + uint64_t idx = UID_NOBODY; zfs_fuid_t *zfuid = NULL; zfs_fuid_info_t *fuidp = NULL; @@ -711,9 +729,11 @@ boolean_t zfs_groupmember(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr) { #ifdef HAVE_KSID + uid_t gid; + +#ifdef illumos ksid_t *ksid = crgetsid(cr, KSID_GROUP); ksidlist_t *ksidlist = crgetsidlist(cr); - uid_t gid; if (ksid && ksidlist) { int i; @@ -746,6 +766,7 @@ zfs_groupmember(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr) } } } +#endif /* illumos */ /* * Not found in ksidlist, check posix groups |