diff options
author | Matthew Ahrens <[email protected]> | 2020-07-11 17:18:02 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-11 17:18:02 -0700 |
commit | e59a377a8fdbf4e66864d1654c0055fdff5f12f4 (patch) | |
tree | 609771a9e795d30ef8b6d5c451a3863af304224a /module/os/linux | |
parent | 217f48373f9878a3cd714b8007444f46101aad9e (diff) |
filesystem_limit/snapshot_limit is incorrectly enforced against root
The filesystem_limit and snapshot_limit properties limit the number of
filesystems or snapshots that can be created below this dataset.
According to the manpage, "The limit is not enforced if the user is
allowed to change the limit." Two types of users are allowed to change
the limit:
1. Those that have been delegated the `filesystem_limit` or
`snapshot_limit` permission, e.g. with
`zfs allow USER filesystem_limit DATASET`. This works properly.
2. A user with elevated system privileges (e.g. root). This does not
work - the root user will incorrectly get an error when trying to create
a snapshot/filesystem, if it exceeds the `_limit` property.
The problem is that `priv_policy_ns()` does not work if the `cred_t` is
not that of the current process. This happens when
`dsl_enforce_ds_ss_limits()` is called in syncing context (as part of a
sync task's check func) to determine the permissions of the
corresponding user process.
This commit fixes the issue by passing the `task_struct` (typedef'ed as
a `proc_t`) to syncing context, and then using `has_capability()` to
determine if that process is privileged. Note that we still need to
pass the `cred_t` to syncing context so that we can check if the user
was delegated this permission with `zfs allow`.
This problem only impacts Linux. Wrappers are added to FreeBSD but it
continues to use `priv_check_cred()`, which works on arbitrary `cred_t`.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Matthew Ahrens <[email protected]>
Closes #8226
Closes #10545
Diffstat (limited to 'module/os/linux')
-rw-r--r-- | module/os/linux/zfs/policy.c | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/module/os/linux/zfs/policy.c b/module/os/linux/zfs/policy.c index 552530226..eaa5372f2 100644 --- a/module/os/linux/zfs/policy.c +++ b/module/os/linux/zfs/policy.c @@ -42,11 +42,9 @@ * all other cases this function must fail and return the passed err. */ static int -priv_policy_ns(const cred_t *cr, int capability, boolean_t all, int err, +priv_policy_ns(const cred_t *cr, int capability, int err, struct user_namespace *ns) { - ASSERT3S(all, ==, B_FALSE); - if (cr != CRED() && (cr != kcred)) return (err); @@ -61,13 +59,13 @@ priv_policy_ns(const cred_t *cr, int capability, boolean_t all, int err, } static int -priv_policy(const cred_t *cr, int capability, boolean_t all, int err) +priv_policy(const cred_t *cr, int capability, int err) { - return (priv_policy_ns(cr, capability, all, err, NULL)); + return (priv_policy_ns(cr, capability, err, NULL)); } static int -priv_policy_user(const cred_t *cr, int capability, boolean_t all, int err) +priv_policy_user(const cred_t *cr, int capability, int err) { /* * All priv_policy_user checks are preceded by kuid/kgid_has_mapping() @@ -76,9 +74,9 @@ priv_policy_user(const cred_t *cr, int capability, boolean_t all, int err) * namespace. */ #if defined(CONFIG_USER_NS) - return (priv_policy_ns(cr, capability, all, err, cr->user_ns)); + return (priv_policy_ns(cr, capability, err, cr->user_ns)); #else - return (priv_policy_ns(cr, capability, all, err, NULL)); + return (priv_policy_ns(cr, capability, err, NULL)); #endif } @@ -89,7 +87,7 @@ priv_policy_user(const cred_t *cr, int capability, boolean_t all, int err) int secpolicy_nfs(const cred_t *cr) { - return (priv_policy(cr, CAP_SYS_ADMIN, B_FALSE, EPERM)); + return (priv_policy(cr, CAP_SYS_ADMIN, EPERM)); } /* @@ -98,7 +96,7 @@ secpolicy_nfs(const cred_t *cr) int secpolicy_sys_config(const cred_t *cr, boolean_t checkonly) { - return (priv_policy(cr, CAP_SYS_ADMIN, B_FALSE, EPERM)); + return (priv_policy(cr, CAP_SYS_ADMIN, EPERM)); } /* @@ -134,10 +132,10 @@ secpolicy_vnode_any_access(const cred_t *cr, struct inode *ip, uid_t owner) return (EPERM); #endif - if (priv_policy_user(cr, CAP_DAC_OVERRIDE, B_FALSE, EPERM) == 0) + if (priv_policy_user(cr, CAP_DAC_OVERRIDE, EPERM) == 0) return (0); - if (priv_policy_user(cr, CAP_DAC_READ_SEARCH, B_FALSE, EPERM) == 0) + if (priv_policy_user(cr, CAP_DAC_READ_SEARCH, EPERM) == 0) return (0); return (EPERM); @@ -157,7 +155,7 @@ secpolicy_vnode_chown(const cred_t *cr, uid_t owner) return (EPERM); #endif - return (priv_policy_user(cr, CAP_FOWNER, B_FALSE, EPERM)); + return (priv_policy_user(cr, CAP_FOWNER, EPERM)); } /* @@ -166,7 +164,7 @@ secpolicy_vnode_chown(const cred_t *cr, uid_t owner) int secpolicy_vnode_create_gid(const cred_t *cr) { - return (priv_policy(cr, CAP_SETGID, B_FALSE, EPERM)); + return (priv_policy(cr, CAP_SETGID, EPERM)); } /* @@ -176,7 +174,7 @@ secpolicy_vnode_create_gid(const cred_t *cr) int secpolicy_vnode_remove(const cred_t *cr) { - return (priv_policy(cr, CAP_FOWNER, B_FALSE, EPERM)); + return (priv_policy(cr, CAP_FOWNER, EPERM)); } /* @@ -194,7 +192,7 @@ secpolicy_vnode_setdac(const cred_t *cr, uid_t owner) return (EPERM); #endif - return (priv_policy_user(cr, CAP_FOWNER, B_FALSE, EPERM)); + return (priv_policy_user(cr, CAP_FOWNER, EPERM)); } /* @@ -208,7 +206,7 @@ secpolicy_vnode_setdac(const cred_t *cr, uid_t owner) int secpolicy_vnode_setid_retain(const cred_t *cr, boolean_t issuidroot) { - return (priv_policy_user(cr, CAP_FSETID, B_FALSE, EPERM)); + return (priv_policy_user(cr, CAP_FSETID, EPERM)); } /* @@ -222,7 +220,7 @@ secpolicy_vnode_setids_setgids(const cred_t *cr, gid_t gid) return (EPERM); #endif if (crgetfsgid(cr) != gid && !groupmember(gid, cr)) - return (priv_policy_user(cr, CAP_FSETID, B_FALSE, EPERM)); + return (priv_policy_user(cr, CAP_FSETID, EPERM)); return (0); } @@ -234,7 +232,7 @@ secpolicy_vnode_setids_setgids(const cred_t *cr, gid_t gid) int secpolicy_zinject(const cred_t *cr) { - return (priv_policy(cr, CAP_SYS_ADMIN, B_FALSE, EACCES)); + return (priv_policy(cr, CAP_SYS_ADMIN, EACCES)); } /* @@ -244,7 +242,20 @@ secpolicy_zinject(const cred_t *cr) int secpolicy_zfs(const cred_t *cr) { - return (priv_policy(cr, CAP_SYS_ADMIN, B_FALSE, EACCES)); + return (priv_policy(cr, CAP_SYS_ADMIN, EACCES)); +} + +/* + * Equivalent to secpolicy_zfs(), but works even if the cred_t is not that of + * the current process. Takes both cred_t and proc_t so that this can work + * easily on all platforms. + */ +int +secpolicy_zfs_proc(const cred_t *cr, proc_t *proc) +{ + if (!has_capability(proc, CAP_SYS_ADMIN)) + return (EACCES); + return (0); } void @@ -273,7 +284,7 @@ secpolicy_vnode_setid_modify(const cred_t *cr, uid_t owner) return (EPERM); #endif - return (priv_policy_user(cr, CAP_FSETID, B_FALSE, EPERM)); + return (priv_policy_user(cr, CAP_FSETID, EPERM)); } /* |