[PATCH v39 37/42] LSM: Infrastructure management of the mnt_opts security blob
Casey Schaufler
casey at schaufler-ca.com
Fri Dec 15 22:16:31 UTC 2023
Move management of the mnt_opts->security blob out of the
individual security modules and into the security
infrastructure. Blobs are atill allocated within the modules
as they are only required when mount options are present.
The modules tell the infrastructure how much space is required,
and the space is allocated if needed. Modules can no longer
count on the presence of a blob implying that mount options
specific to that module are present, so flags are added
to the module specific blobs to indicate that this module
has options.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
---
security/security.c | 14 ++++-----
security/selinux/hooks.c | 58 +++++++++++++++++++++++-------------
security/smack/smack_lsm.c | 61 ++++++++++++++++++++++++++------------
3 files changed, 85 insertions(+), 48 deletions(-)
diff --git a/security/security.c b/security/security.c
index 092752666fb6..64cdf0e09832 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1352,18 +1352,15 @@ int security_fs_context_parse_param(struct fs_context *fc,
struct fs_parameter *param)
{
struct security_hook_list *hp;
- int trc;
- int rc = -ENOPARAM;
+ int rc;
hlist_for_each_entry(hp, &security_hook_heads.fs_context_parse_param,
list) {
- trc = hp->hook.fs_context_parse_param(fc, param);
- if (trc == 0)
- rc = 0;
- else if (trc != -ENOPARAM)
- return trc;
+ rc = hp->hook.fs_context_parse_param(fc, param);
+ if (rc != -ENOPARAM)
+ return rc;
}
- return rc;
+ return -ENOPARAM;
}
/**
@@ -1437,6 +1434,7 @@ void security_free_mnt_opts(void **mnt_opts)
if (!*mnt_opts)
return;
call_void_hook(sb_free_mnt_opts, *mnt_opts);
+ kfree(*mnt_opts);
*mnt_opts = NULL;
}
EXPORT_SYMBOL(security_free_mnt_opts);
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index a9af3c848a16..46dee63eec12 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -365,15 +365,28 @@ static void inode_free_security(struct inode *inode)
}
struct selinux_mnt_opts {
+ bool initialized;
u32 fscontext_sid;
u32 context_sid;
u32 rootcontext_sid;
u32 defcontext_sid;
};
+static inline struct selinux_mnt_opts *selinux_mnt_opts(void *mnt_opts)
+{
+ if (mnt_opts)
+ return mnt_opts + selinux_blob_sizes.lbs_mnt_opts;
+ return NULL;
+}
+
static void selinux_free_mnt_opts(void *mnt_opts)
{
- kfree(mnt_opts);
+ struct selinux_mnt_opts *opts;
+
+ if (mnt_opts) {
+ opts = selinux_mnt_opts(mnt_opts);
+ opts->initialized = false;
+ }
}
enum {
@@ -628,7 +641,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
const struct cred *cred = current_cred();
struct superblock_security_struct *sbsec = selinux_superblock(sb);
struct dentry *root = sb->s_root;
- struct selinux_mnt_opts *opts = mnt_opts;
+ struct selinux_mnt_opts *opts = selinux_mnt_opts(mnt_opts);
struct inode_security_struct *root_isec;
u32 fscontext_sid = 0, context_sid = 0, rootcontext_sid = 0;
u32 defcontext_sid = 0;
@@ -644,7 +657,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
mutex_lock(&sbsec->lock);
if (!selinux_initialized()) {
- if (!opts) {
+ if (!opts || !opts->initialized) {
/* Defer initialization until selinux_complete_init,
after the initial policy is loaded and the security
server is ready to handle calls. */
@@ -682,7 +695,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
* also check if someone is trying to mount the same sb more
* than once with different security options.
*/
- if (opts) {
+ if (opts && opts->initialized) {
if (opts->fscontext_sid) {
fscontext_sid = opts->fscontext_sid;
if (bad_option(sbsec, FSCONTEXT_MNT, sbsec->sid,
@@ -991,7 +1004,7 @@ static int selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
*/
static int selinux_add_opt(int token, const char *s, void **mnt_opts)
{
- struct selinux_mnt_opts *opts = *mnt_opts;
+ struct selinux_mnt_opts *opts;
u32 *dst_sid;
int rc;
@@ -1006,12 +1019,12 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts)
return -EINVAL;
}
- if (!opts) {
- opts = kzalloc(sizeof(*opts), GFP_KERNEL);
- if (!opts)
+ if (!*mnt_opts) {
+ *mnt_opts = lsm_mnt_opts_alloc(GFP_KERNEL);
+ if (!*mnt_opts)
return -ENOMEM;
- *mnt_opts = opts;
}
+ opts = selinux_mnt_opts(*mnt_opts);
switch (token) {
case Opt_context:
@@ -1038,6 +1051,7 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts)
WARN_ON(1);
return -EINVAL;
}
+ opts->initialized = true;
rc = security_context_str_to_sid(s, dst_sid, GFP_KERNEL);
if (rc)
pr_warn("SELinux: security_context_str_to_sid (%s) failed with errno=%d\n",
@@ -2629,10 +2643,7 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
return 0;
free_opt:
- if (*mnt_opts) {
- selinux_free_mnt_opts(*mnt_opts);
- *mnt_opts = NULL;
- }
+ selinux_free_mnt_opts(*mnt_opts);
return rc;
}
@@ -2683,13 +2694,13 @@ static int selinux_sb_mnt_opts_compat(struct super_block *sb, void *mnt_opts)
static int selinux_sb_remount(struct super_block *sb, void *mnt_opts)
{
- struct selinux_mnt_opts *opts = mnt_opts;
+ struct selinux_mnt_opts *opts = selinux_mnt_opts(mnt_opts);
struct superblock_security_struct *sbsec = selinux_superblock(sb);
if (!(sbsec->flags & SE_SBINITIALIZED))
return 0;
- if (!opts)
+ if (!opts || !opts->initialized)
return 0;
if (opts->fscontext_sid) {
@@ -2787,9 +2798,13 @@ static int selinux_fs_context_submount(struct fs_context *fc,
if (!(sbsec->flags & (FSCONTEXT_MNT|CONTEXT_MNT|DEFCONTEXT_MNT)))
return 0;
- opts = lsm_mnt_opts_alloc(GFP_KERNEL);
- if (!opts)
- return -ENOMEM;
+ if (!fc->security) {
+ fc->security = lsm_mnt_opts_alloc(GFP_KERNEL);
+ if (!fc->security)
+ return -ENOMEM;
+ }
+ opts = selinux_mnt_opts(fc->security);
+ opts->initialized = true;
if (sbsec->flags & FSCONTEXT_MNT)
opts->fscontext_sid = sbsec->sid;
@@ -2797,14 +2812,14 @@ static int selinux_fs_context_submount(struct fs_context *fc,
opts->context_sid = sbsec->mntpoint_sid;
if (sbsec->flags & DEFCONTEXT_MNT)
opts->defcontext_sid = sbsec->def_sid;
- fc->security = opts;
return 0;
}
static int selinux_fs_context_dup(struct fs_context *fc,
struct fs_context *src_fc)
{
- const struct selinux_mnt_opts *src = src_fc->security;
+ const struct selinux_mnt_opts *src = selinux_mnt_opts(src_fc->security);
+ struct selinux_mnt_opts *dst;
if (!src)
return 0;
@@ -2813,7 +2828,8 @@ static int selinux_fs_context_dup(struct fs_context *fc,
if (!fc->security)
return -ENOMEM;
- memcpy(fc->security, src, sizeof(*src));
+ dst = selinux_mnt_opts(fc->security);
+ memcpy(dst, src, sizeof(*src));
return 0;
}
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index b273e94028bb..61bd3f626e7d 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -560,6 +560,7 @@ static int smack_sb_alloc_security(struct super_block *sb)
}
struct smack_mnt_opts {
+ bool initialized;
const char *fsdefault;
const char *fsfloor;
const char *fshat;
@@ -567,24 +568,37 @@ struct smack_mnt_opts {
const char *fstransmute;
};
+static inline struct smack_mnt_opts *smack_mnt_opts(void *mnt_opts)
+{
+ if (mnt_opts)
+ return mnt_opts + smack_blob_sizes.lbs_mnt_opts;
+ return NULL;
+}
+
static void smack_free_mnt_opts(void *mnt_opts)
{
- kfree(mnt_opts);
+ struct smack_mnt_opts *opts;
+
+ if (mnt_opts) {
+ opts = smack_mnt_opts(mnt_opts);
+ opts->initialized = false;
+ }
}
static int smack_add_opt(int token, const char *s, void **mnt_opts)
{
- struct smack_mnt_opts *opts = *mnt_opts;
+ struct smack_mnt_opts *opts;
struct smack_known *skp;
- if (!opts) {
- opts = kzalloc(sizeof(struct smack_mnt_opts), GFP_KERNEL);
- if (!opts)
+ if (!s)
+ return -EINVAL;
+
+ if (!*mnt_opts) {
+ *mnt_opts = lsm_mnt_opts_alloc(GFP_KERNEL);
+ if (!*mnt_opts)
return -ENOMEM;
- *mnt_opts = opts;
}
- if (!s)
- return -ENOMEM;
+ opts = smack_mnt_opts(*mnt_opts);
skp = smk_import_entry(s, 0);
if (IS_ERR(skp))
@@ -617,6 +631,7 @@ static int smack_add_opt(int token, const char *s, void **mnt_opts)
opts->fstransmute = skp->smk_known;
break;
}
+ opts->initialized = true;
return 0;
out_opt_err:
@@ -638,10 +653,12 @@ static int smack_fs_context_submount(struct fs_context *fc,
struct smack_mnt_opts *ctx;
struct inode_smack *isp;
- ctx = lsm_mnt_opts_alloc(GFP_KERNEL);
- if (!ctx)
- return -ENOMEM;
- fc->security = ctx;
+ if (!fc->security) {
+ fc->security = lsm_mnt_opts_alloc(GFP_KERNEL);
+ if (!fc->security)
+ return -ENOMEM;
+ }
+ ctx = smack_mnt_opts(fc->security);
sbsp = smack_superblock(reference);
isp = smack_inode(reference->s_root->d_inode);
@@ -671,6 +688,7 @@ static int smack_fs_context_submount(struct fs_context *fc,
return -ENOMEM;
}
}
+ ctx->initialized = true;
return 0;
}
@@ -684,16 +702,21 @@ static int smack_fs_context_submount(struct fs_context *fc,
static int smack_fs_context_dup(struct fs_context *fc,
struct fs_context *src_fc)
{
- struct smack_mnt_opts *dst, *src = src_fc->security;
+ struct smack_mnt_opts *src;
+ struct smack_mnt_opts *dst;
+ src = smack_mnt_opts(src_fc->security);
if (!src)
return 0;
- fc->security = lsm_mnt_opts_alloc(GFP_KERNEL);
- if (!fc->security)
- return -ENOMEM;
+ if (!fc->security) {
+ fc->security = lsm_mnt_opts_alloc(GFP_KERNEL);
+ if (!fc->security)
+ return -ENOMEM;
+ }
- dst = fc->security;
+ dst = smack_mnt_opts(fc->security);
+ dst->initialized = src->initialized;
dst->fsdefault = src->fsdefault;
dst->fsfloor = src->fsfloor;
dst->fshat = src->fshat;
@@ -803,7 +826,7 @@ static int smack_set_mnt_opts(struct super_block *sb,
struct superblock_smack *sp = smack_superblock(sb);
struct inode_smack *isp;
struct smack_known *skp;
- struct smack_mnt_opts *opts = mnt_opts;
+ struct smack_mnt_opts *opts = smack_mnt_opts(mnt_opts);
bool transmute = false;
if (sp->smk_flags & SMK_SB_INITIALIZED)
@@ -836,7 +859,7 @@ static int smack_set_mnt_opts(struct super_block *sb,
sp->smk_flags |= SMK_SB_INITIALIZED;
- if (opts) {
+ if (opts && opts->initialized) {
if (opts->fsdefault) {
skp = smk_import_entry(opts->fsdefault, 0);
if (IS_ERR(skp))
--
2.41.0
More information about the Linux-security-module-archive
mailing list