diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2018-03-02 02:48:02 +0300 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2018-03-02 02:48:02 +0300 |
| commit | aa8e712cee93d520e96a2ca8e3a20f807c937e3f (patch) | |
| tree | 5e2bdce92022ebb334bfa68b6a731b71ef86974d /security/selinux/xfrm.c | |
| parent | 2572f5b4245abf2b4e5a86cabf65a50efda09aac (diff) | |
| download | linux-aa8e712cee93d520e96a2ca8e3a20f807c937e3f.tar.xz | |
selinux: wrap global selinux state
Define a selinux state structure (struct selinux_state) for
global SELinux state and pass it explicitly to all security server
functions. The public portion of the structure contains state
that is used throughout the SELinux code, such as the enforcing mode.
The structure also contains a pointer to a selinux_ss structure whose
definition is private to the security server and contains security
server specific state such as the policy database and SID table.
This change should have no effect on SELinux behavior or APIs
(userspace or LSM). It merely wraps SELinux state and passes it
explicitly as needed.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
[PM: minor fixups needed due to collisions with the SCTP patches]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux/xfrm.c')
| -rw-r--r-- | security/selinux/xfrm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index 928188902901..a5ac27de571f 100644 --- a/security/selinux/xfrm.c +++ b/security/selinux/xfrm.c @@ -101,7 +101,8 @@ static int selinux_xfrm_alloc_user(struct xfrm_sec_ctx **ctxp, ctx->ctx_len = str_len; memcpy(ctx->ctx_str, &uctx[1], str_len); ctx->ctx_str[str_len] = '\0'; - rc = security_context_to_sid(ctx->ctx_str, str_len, &ctx->ctx_sid, gfp); + rc = security_context_to_sid(&selinux_state, ctx->ctx_str, str_len, + &ctx->ctx_sid, gfp); if (rc) goto err; @@ -352,7 +353,8 @@ int selinux_xfrm_state_alloc_acquire(struct xfrm_state *x, if (secid == 0) return -EINVAL; - rc = security_sid_to_context(secid, &ctx_str, &str_len); + rc = security_sid_to_context(&selinux_state, secid, &ctx_str, + &str_len); if (rc) return rc; |