diff options
| author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-10-21 17:44:25 -0400 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2015-10-21 17:44:25 -0400 |
| commit | 44be2f65d979291ffb2a47112449507ffe1f9726 (patch) | |
| tree | 9f3732d534de8425f6bf5d7519812263d0c292c9 /security/selinux/ss/services.c | |
| parent | 44d37ad3602b3823764eeb0f6c1ee3ef6c4fb936 (diff) | |
| download | op-kernel-dev-44be2f65d979291ffb2a47112449507ffe1f9726.zip op-kernel-dev-44be2f65d979291ffb2a47112449507ffe1f9726.tar.gz | |
selinux: introduce security_context_str_to_sid
There seems to be a little confusion as to whether the scontext_len
parameter of security_context_to_sid() includes the nul-byte or
not. Reading security_context_to_sid_core(), it seems that the
expectation is that it does not (both the string copying and the test
for scontext_len being zero hint at that).
Introduce the helper security_context_str_to_sid() to do the strlen()
call and fix all callers.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'security/selinux/ss/services.c')
| -rw-r--r-- | security/selinux/ss/services.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index b7df12b..c550df0 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1476,6 +1476,11 @@ int security_context_to_sid(const char *scontext, u32 scontext_len, u32 *sid, sid, SECSID_NULL, gfp, 0); } +int security_context_str_to_sid(const char *scontext, u32 *sid, gfp_t gfp) +{ + return security_context_to_sid(scontext, strlen(scontext), sid, gfp); +} + /** * security_context_to_sid_default - Obtain a SID for a given security context, * falling back to specified default if needed. |
