selinux: parse sids earlier to avoid doing memory allocations under spinlock
Subsystems (3)
v3 cover selinux: parse sids earlier to avoid doing memory allocations under spinlock
selinux_sb_mnt_opts_compat() is called under the sb_lock spinlock and shouldn't be performing any memory allocations.
The first patch fixes this by parsing the sids at the same time the context mount options are being parsed from the mount options string and storing the parsed sids in the selinux_mnt_opts struct.
The second patch adds logic to selinux_set_mnt_opts() and selinux_sb_remount() that checks to see if a sid has already been parsed before calling parse_sid(), and adds the parsed sids to the data being copied in selinux_fs_context_dup().
Scott Mayhew (2):
selinux: Fix selinux_sb_mnt_opts_compat()
selinux: try to use preparsed sid before calling parse_sid()
security/selinux/hooks.c | 147 ++++++++++++++++++++++++--------------- 1 file changed, 92 insertions(+), 55 deletions(-)
Signature · 1 line
2.31.1
PATCH v3 1/2 selinux: Fix selinux_sb_mnt_opts_compat()
selinux_sb_mnt_opts_compat() is called under the sb_lock spinlock and shouldn't be performing any memory allocations. Fix this by parsing the sids at the same time we're chopping up the security mount options string and then using the pre-parsed sids when doing the comparison.
--- security/selinux/hooks.c | 75 ++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 34 deletions(-)
security/selinux/hooks.c +41 -34
@@ -342,6 +342,10 @@ static void inode_free_security(struct inode *inode)struct selinux_mnt_opts {const char *fscontext, *context, *rootcontext, *defcontext; +u32 fscontext_sid; +u32 context_sid; +u32 rootcontext_sid; +u32 defcontext_sid; };static void selinux_free_mnt_opts (void *mnt_opts)
@@ -598,15 +602,14 @@ static int bad_option(struct superblock_security_struct *sbsec, char flag,return 0 ; } -static int parse_sid (struct super_block *sb,const char *s,u32 *sid, -gfp_t gfp) +static int parse_sid (struct super_block *sb,const char *s,u32 *sid) {int rc =security_context_str_to_sid (&selinux_state, s, - sid, gfp); + sid,GFP_KERNEL );if (rc)pr_warn ("SELinux: security_context_str_to_sid" "(%s) failed for (dev %s, type %s) errno=%d\n" , - s, sb->s_id, sb->s_type->name, rc); + s, sb ? sb->s_id :"?" , sb ? sb->s_type->name :"?" , rc);return rc; }
@@ -673,8 +676,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,*/ if (opts) {if (opts->fscontext) { - rc =parse_sid (sb, opts->fscontext, &fscontext_sid, -GFP_KERNEL ); + rc =parse_sid (sb, opts->fscontext, &fscontext_sid);if (rc) goto out; if (bad_option(sbsec, FSCONTEXT_MNT, sbsec->sid,
@@ -683,8 +685,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, sbsec->flags |=FSCONTEXT_MNT ; }if (opts->context) { - rc =parse_sid (sb, opts->context, &context_sid, -GFP_KERNEL ); + rc =parse_sid (sb, opts->context, &context_sid);if (rc) goto out; if (bad_option(sbsec, CONTEXT_MNT, sbsec->mntpoint_sid,
@@ -693,8 +694,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, sbsec->flags |=CONTEXT_MNT ; }if (opts->rootcontext) { - rc =parse_sid (sb, opts->rootcontext, &rootcontext_sid, -GFP_KERNEL ); + rc =parse_sid (sb, opts->rootcontext, &rootcontext_sid);if (rc) goto out; if (bad_option(sbsec, ROOTCONTEXT_MNT, root_isec->sid,
@@ -703,8 +703,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, sbsec->flags |=ROOTCONTEXT_MNT ; }if (opts->defcontext) { - rc =parse_sid (sb, opts->defcontext, &defcontext_sid, -GFP_KERNEL ); + rc =parse_sid (sb, opts->defcontext, &defcontext_sid);if (rc) goto out; if (bad_option(sbsec, DEFCONTEXT_MNT, sbsec->def_sid,
@@ -996,21 +995,29 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts)if (opts->context || opts->defcontext) goto err; opts->context = s; +if (selinux_initialized (&selinux_state)) +parse_sid (NULL , s, &opts->context_sid);break ;case Opt_fscontext:if (opts->fscontext) goto err; opts->fscontext = s; +if (selinux_initialized (&selinux_state)) +parse_sid (NULL , s, &opts->fscontext_sid);break ;case Opt_rootcontext:if (opts->rootcontext) goto err; opts->rootcontext = s; +if (selinux_initialized (&selinux_state)) +parse_sid (NULL , s, &opts->rootcontext_sid);break ;case Opt_defcontext:if (opts->context || opts->defcontext) goto err; opts->defcontext = s; +if (selinux_initialized (&selinux_state)) +parse_sid (NULL , s, &opts->defcontext_sid);break ; }
@@ -2648,8 +2655,6 @@ static int selinux_sb_mnt_opts_compat(struct super_block *sb, void *mnt_opts) {struct selinux_mnt_opts *opts = mnt_opts;struct superblock_security_struct *sbsec = sb->s_security; -u32 sid; -int rc;/* * Superblock not initialized (i.e. no options) - reject if any
@@ -2666,34 +2671,36 @@ static int selinux_sb_mnt_opts_compat(struct super_block *sb, void *mnt_opts)return (sbsec->flags &SE_MNTMASK ) ?1 :0 ;if (opts->fscontext) { - rc =parse_sid (sb, opts->fscontext, &sid,GFP_NOWAIT ); -if (rc) +if (opts->fscontext_sid ==SECSID_NULL )return 1 ; -if (bad_option (sbsec,FSCONTEXT_MNT , sbsec->sid, sid)) +else if (bad_option (sbsec,FSCONTEXT_MNT , sbsec->sid, + opts->fscontext_sid))return 1 ; }if (opts->context) { - rc =parse_sid (sb, opts->context, &sid,GFP_NOWAIT ); -if (rc) +if (opts->context_sid ==SECSID_NULL )return 1 ; -if (bad_option (sbsec,CONTEXT_MNT , sbsec->mntpoint_sid, sid)) +else if (bad_option (sbsec,CONTEXT_MNT , sbsec->mntpoint_sid, + opts->context_sid))return 1 ; }if (opts->rootcontext) { -struct inode_security_struct *root_isec; - - root_isec =backing_inode_security (sb->s_root); - rc =parse_sid (sb, opts->rootcontext, &sid,GFP_NOWAIT ); -if (rc) -return 1 ; -if (bad_option (sbsec,ROOTCONTEXT_MNT , root_isec->sid, sid)) +if (opts->rootcontext_sid ==SECSID_NULL )return 1 ; +else { +struct inode_security_struct *root_isec; + + root_isec =backing_inode_security (sb->s_root); +if (bad_option (sbsec,ROOTCONTEXT_MNT , root_isec->sid, + opts->rootcontext_sid)) +return 1 ; + } }if (opts->defcontext) { - rc =parse_sid (sb, opts->defcontext, &sid,GFP_NOWAIT ); -if (rc) +if (opts->defcontext_sid ==SECSID_NULL )return 1 ; -if (bad_option (sbsec,DEFCONTEXT_MNT , sbsec->def_sid, sid)) +else if (bad_option (sbsec,DEFCONTEXT_MNT , sbsec->def_sid, + opts->defcontext_sid))return 1 ; }return 0 ;
@@ -2713,14 +2720,14 @@ static int selinux_sb_remount(struct super_block *sb, void *mnt_opts)return 0 ;if (opts->fscontext) { - rc =parse_sid (sb, opts->fscontext, &sid,GFP_KERNEL ); + rc =parse_sid (sb, opts->fscontext, &sid);if (rc)return rc;if (bad_option (sbsec,FSCONTEXT_MNT , sbsec->sid, sid)) goto out_bad_option; }if (opts->context) { - rc =parse_sid (sb, opts->context, &sid,GFP_KERNEL ); + rc =parse_sid (sb, opts->context, &sid);if (rc)return rc;if (bad_option (sbsec,CONTEXT_MNT , sbsec->mntpoint_sid, sid))
@@ -2729,14 +2736,14 @@ static int selinux_sb_remount(struct super_block *sb, void *mnt_opts)if (opts->rootcontext) {struct inode_security_struct *root_isec; root_isec =backing_inode_security (sb->s_root); - rc =parse_sid (sb, opts->rootcontext, &sid,GFP_KERNEL ); + rc =parse_sid (sb, opts->rootcontext, &sid);if (rc)return rc;if (bad_option (sbsec,ROOTCONTEXT_MNT , root_isec->sid, sid)) goto out_bad_option; }if (opts->defcontext) { - rc =parse_sid (sb, opts->defcontext, &sid,GFP_KERNEL ); + rc =parse_sid (sb, opts->defcontext, &sid);if (rc)return rc;if (bad_option (sbsec,DEFCONTEXT_MNT , sbsec->def_sid, sid))
Signature · 1 line
2.31.1
PATCH v3 2/2 selinux: try to use preparsed sid before calling parse_sid()
In reply to Scott MayhewAvoid unnecessary parsing of sids that have already been parsed via selinux_sb_eat_lsm_opts().
--- security/selinux/hooks.c | 88 +++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 29 deletions(-)
security/selinux/hooks.c +59 -29
@@ -676,36 +676,48 @@ static int selinux_set_mnt_opts(struct super_block *sb,*/ if (opts) {if (opts->fscontext) { - rc =parse_sid (sb, opts->fscontext, &fscontext_sid); -if (rc) - goto out; +if (opts->fscontext_sid ==SECSID_NULL ) { + rc =parse_sid (sb, opts->fscontext, &fscontext_sid); +if (rc) + goto out; + }else + fscontext_sid = opts->fscontext_sid;if (bad_option (sbsec,FSCONTEXT_MNT , sbsec->sid, fscontext_sid)) goto out_double_mount; sbsec->flags |=FSCONTEXT_MNT ; }if (opts->context) { - rc =parse_sid (sb, opts->context, &context_sid); -if (rc) - goto out; +if (opts->context_sid ==SECSID_NULL ) { + rc =parse_sid (sb, opts->context, &context_sid); +if (rc) + goto out; + }else + context_sid = opts->context_sid;if (bad_option (sbsec,CONTEXT_MNT , sbsec->mntpoint_sid, context_sid)) goto out_double_mount; sbsec->flags |=CONTEXT_MNT ; }if (opts->rootcontext) { - rc =parse_sid (sb, opts->rootcontext, &rootcontext_sid); -if (rc) - goto out; +if (opts->rootcontext_sid ==SECSID_NULL ) { + rc =parse_sid (sb, opts->rootcontext, &rootcontext_sid); +if (rc) + goto out; + }else + rootcontext_sid = opts->rootcontext_sid;if (bad_option (sbsec,ROOTCONTEXT_MNT , root_isec->sid, rootcontext_sid)) goto out_double_mount; sbsec->flags |=ROOTCONTEXT_MNT ; }if (opts->defcontext) { - rc =parse_sid (sb, opts->defcontext, &defcontext_sid); -if (rc) - goto out; +if (opts->defcontext_sid ==SECSID_NULL ) { + rc =parse_sid (sb, opts->defcontext, &defcontext_sid); +if (rc) + goto out; + }else + defcontext_sid = opts->defcontext_sid;if (bad_option (sbsec,DEFCONTEXT_MNT , sbsec->def_sid, defcontext_sid)) goto out_double_mount;
@@ -2710,7 +2722,6 @@ static int selinux_sb_remount(struct super_block *sb, void *mnt_opts) {struct selinux_mnt_opts *opts = mnt_opts;struct superblock_security_struct *sbsec =selinux_superblock (sb); -u32 sid;int rc;if (!(sbsec->flags &SE_SBINITIALIZED ))
@@ -2720,33 +2731,48 @@ static int selinux_sb_remount(struct super_block *sb, void *mnt_opts)return 0 ;if (opts->fscontext) { - rc =parse_sid (sb, opts->fscontext, &sid); -if (rc) -return rc; -if (bad_option (sbsec,FSCONTEXT_MNT , sbsec->sid, sid)) +if (opts->fscontext_sid ==SECSID_NULL ) { + rc =parse_sid (sb, opts->fscontext, + &opts->fscontext_sid); +if (rc) +return rc; + } +if (bad_option (sbsec,FSCONTEXT_MNT , sbsec->sid, + opts->fscontext_sid)) goto out_bad_option; }if (opts->context) { - rc =parse_sid (sb, opts->context, &sid); -if (rc) -return rc; -if (bad_option (sbsec,CONTEXT_MNT , sbsec->mntpoint_sid, sid)) +if (opts->context_sid ==SECSID_NULL ) { + rc =parse_sid (sb, opts->context, &opts->context_sid); +if (rc) +return rc; + } +if (bad_option (sbsec,CONTEXT_MNT , sbsec->mntpoint_sid, + opts->context_sid)) goto out_bad_option; }if (opts->rootcontext) {struct inode_security_struct *root_isec; root_isec =backing_inode_security (sb->s_root); - rc =parse_sid (sb, opts->rootcontext, &sid); -if (rc) -return rc; -if (bad_option (sbsec,ROOTCONTEXT_MNT , root_isec->sid, sid)) +if (opts->rootcontext_sid ==SECSID_NULL ) { + rc =parse_sid (sb, opts->rootcontext, + &opts->rootcontext_sid); +if (rc) +return rc; + } +if (bad_option (sbsec,ROOTCONTEXT_MNT , root_isec->sid, + opts->rootcontext_sid)) goto out_bad_option; }if (opts->defcontext) { - rc =parse_sid (sb, opts->defcontext, &sid); -if (rc) -return rc; -if (bad_option (sbsec,DEFCONTEXT_MNT , sbsec->def_sid, sid)) +if (opts->defcontext_sid ==SECSID_NULL ) { + rc =parse_sid (sb, opts->defcontext, + &opts->defcontext_sid); +if (rc) +return rc; + } +if (bad_option (sbsec,DEFCONTEXT_MNT , sbsec->def_sid, + opts->defcontext_sid)) goto out_bad_option; }return 0 ;
@@ -2844,6 +2870,10 @@ static int selinux_fs_context_dup(struct fs_context *fc,if (!opts->defcontext)return -ENOMEM ; } + opts->fscontext_sid = src->fscontext_sid; + opts->context_sid = src->context_sid; + opts->rootcontext_sid = src->rootcontext_sid; + opts->defcontext_sid = src->defcontext_sid;return 0 ; }
Signature · 1 line
2.31.1
Paul Moore
maintainerQuoted 13 lines · Scott Mayhew
selinux_sb_mnt_opts_compat()is called under thesb_lockspinlock and shouldn't be performing any memory allocations.The first patch fixes this by parsing the sids at the same time the context mount options are being parsed from the mount options string and storing the parsed sids in the
selinux_mnt_optsstruct.The second patch adds logic to
selinux_set_mnt_opts()andselinux_sb_remount()that checks to see if a sid has already been parsed before callingparse_sid(), and adds the parsed sids to the data being copied inselinux_fs_context_dup().
Quoted 6 lines
Scott Mayhew (2):
selinux: Fixselinux_sb_mnt_opts_compat()
selinux: try to use preparsed sid before callingparse_sid()security/selinux/hooks.c | 147 ++++++++++++++++++++++++--------------- 1 file changed, 92 insertions(+), 55 deletions(-)
Merged both into selinux/next, thanks Scott.
Signature · 1 line
paul-moore.com