diff options
author | David Howells <dhowells@redhat.com> | 2008-01-15 18:47:35 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-01-24 19:29:53 -0500 |
commit | 63cb34492351078479b2d4bae6a881806a396286 (patch) | |
tree | d33ab15eda40c5195c4a723d9e49591a9b4950f9 /security/selinux/hooks.c | |
parent | c43e259cc756ece387faae849af0058b56d78466 (diff) |
security: add a secctx_to_secid() hook
Add a secctx_to_secid() LSM hook to go along with the existing
secid_to_secctx() LSM hook. This patch also includes the SELinux
implementation for this hook.
Signed-off-by: Paul Moore <paul.moore@hp.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r-- | security/selinux/hooks.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 233c8b97462f..0396354fff95 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -4947,6 +4947,11 @@ static int selinux_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) | |||
4947 | return security_sid_to_context(secid, secdata, seclen); | 4947 | return security_sid_to_context(secid, secdata, seclen); |
4948 | } | 4948 | } |
4949 | 4949 | ||
4950 | static int selinux_secctx_to_secid(char *secdata, u32 seclen, u32 *secid) | ||
4951 | { | ||
4952 | return security_context_to_sid(secdata, seclen, secid); | ||
4953 | } | ||
4954 | |||
4950 | static void selinux_release_secctx(char *secdata, u32 seclen) | 4955 | static void selinux_release_secctx(char *secdata, u32 seclen) |
4951 | { | 4956 | { |
4952 | kfree(secdata); | 4957 | kfree(secdata); |
@@ -5138,6 +5143,7 @@ static struct security_operations selinux_ops = { | |||
5138 | .setprocattr = selinux_setprocattr, | 5143 | .setprocattr = selinux_setprocattr, |
5139 | 5144 | ||
5140 | .secid_to_secctx = selinux_secid_to_secctx, | 5145 | .secid_to_secctx = selinux_secid_to_secctx, |
5146 | .secctx_to_secid = selinux_secctx_to_secid, | ||
5141 | .release_secctx = selinux_release_secctx, | 5147 | .release_secctx = selinux_release_secctx, |
5142 | 5148 | ||
5143 | .unix_stream_connect = selinux_socket_unix_stream_connect, | 5149 | .unix_stream_connect = selinux_socket_unix_stream_connect, |