From: Casey Schaufler <casey@schaufler-ca.com>
To: Stephen Smalley <sds@tycho.nsa.gov>, paul@paul-moore.com
Cc: keescook@chromium.org, selinux@vger.kernel.org,
linux-security-module@vger.kernel.org, jmorris@namei.org,
dhowells@redhat.com, casey@schaufler-ca.com
Subject: Re: [PATCH] selinux: fix residual uses of current_security() for the SELinux blob
Date: Wed, 4 Sep 2019 08:16:00 -0700 [thread overview]
Message-ID: <0edb10a8-7c6a-bee1-b6d4-382ee1ed51ee@schaufler-ca.com> (raw)
In-Reply-To: <20190904143248.7003-1-sds@tycho.nsa.gov>
On 9/4/2019 7:32 AM, Stephen Smalley wrote:
> We need to use selinux_cred() to fetch the SELinux cred blob instead
> of directly using current->security or current_security(). There
> were a couple of lingering uses of current_security() in the SELinux code
> that were apparently missed during the earlier conversions.
Thank you for finding this.
> IIUC, this
> would only manifest as a bug if multiple security modules including
> SELinux are enabled and SELinux is not first in the lsm order. After
> this change, there appear to be no other users of current_security()
> in-tree; perhaps we should remove it altogether.
I agree.
>
> Fixes: bbd3662a8348 ("Infrastructure management of the cred security blob")
> Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
> ---
> security/selinux/hooks.c | 2 +-
> security/selinux/include/objsec.h | 20 ++++++++++----------
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index d55571c585ff..f1b763eceef9 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -3435,7 +3435,7 @@ static int selinux_inode_copy_up_xattr(const char *name)
> static int selinux_kernfs_init_security(struct kernfs_node *kn_dir,
> struct kernfs_node *kn)
> {
> - const struct task_security_struct *tsec = current_security();
> + const struct task_security_struct *tsec = selinux_cred(current_cred());
> u32 parent_sid, newsid, clen;
> int rc;
> char *context;
> diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
> index 231262d8eac9..d2e00c7595dd 100644
> --- a/security/selinux/include/objsec.h
> +++ b/security/selinux/include/objsec.h
> @@ -40,16 +40,6 @@ struct task_security_struct {
> u32 sockcreate_sid; /* fscreate SID */
> };
>
> -/*
> - * get the subjective security ID of the current task
> - */
> -static inline u32 current_sid(void)
> -{
> - const struct task_security_struct *tsec = current_security();
> -
> - return tsec->sid;
> -}
> -
> enum label_initialized {
> LABEL_INVALID, /* invalid or not initialized */
> LABEL_INITIALIZED, /* initialized */
> @@ -188,4 +178,14 @@ static inline struct ipc_security_struct *selinux_ipc(
> return ipc->security + selinux_blob_sizes.lbs_ipc;
> }
>
> +/*
> + * get the subjective security ID of the current task
> + */
> +static inline u32 current_sid(void)
> +{
> + const struct task_security_struct *tsec = selinux_cred(current_cred());
> +
> + return tsec->sid;
> +}
> +
> #endif /* _SELINUX_OBJSEC_H_ */
next prev parent reply other threads:[~2019-09-04 15:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-04 14:32 [PATCH] selinux: fix residual uses of current_security() for the SELinux blob Stephen Smalley
2019-09-04 15:16 ` Casey Schaufler [this message]
2019-09-04 15:31 ` Stephen Smalley
2019-09-04 16:46 ` John Johansen
2019-09-04 19:35 ` James Morris
2019-09-04 22:50 ` Paul Moore
2019-09-05 20:01 ` Stephen Smalley
2019-09-05 20:55 ` James Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0edb10a8-7c6a-bee1-b6d4-382ee1ed51ee@schaufler-ca.com \
--to=casey@schaufler-ca.com \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=sds@tycho.nsa.gov \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).