aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/dummy.c2
-rw-r--r--security/security.c2
-rw-r--r--security/selinux/hooks.c2
-rw-r--r--security/selinux/include/security.h2
-rw-r--r--security/selinux/ss/services.c4
-rw-r--r--security/smack/smack_lsm.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/security/dummy.c b/security/dummy.c
index 48cf30226e16..f50c6c3c32c9 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -968,7 +968,7 @@ static int dummy_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
968 return -EOPNOTSUPP; 968 return -EOPNOTSUPP;
969} 969}
970 970
971static int dummy_secctx_to_secid(char *secdata, u32 seclen, u32 *secid) 971static int dummy_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)
972{ 972{
973 return -EOPNOTSUPP; 973 return -EOPNOTSUPP;
974} 974}
diff --git a/security/security.c b/security/security.c
index 8e64a29dc55d..59838a99b80e 100644
--- a/security/security.c
+++ b/security/security.c
@@ -886,7 +886,7 @@ int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
886} 886}
887EXPORT_SYMBOL(security_secid_to_secctx); 887EXPORT_SYMBOL(security_secid_to_secctx);
888 888
889int security_secctx_to_secid(char *secdata, u32 seclen, u32 *secid) 889int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)
890{ 890{
891 return security_ops->secctx_to_secid(secdata, seclen, secid); 891 return security_ops->secctx_to_secid(secdata, seclen, secid);
892} 892}
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 4e4de98941ae..85a220465a8f 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5238,7 +5238,7 @@ static int selinux_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
5238 return security_sid_to_context(secid, secdata, seclen); 5238 return security_sid_to_context(secid, secdata, seclen);
5239} 5239}
5240 5240
5241static int selinux_secctx_to_secid(char *secdata, u32 seclen, u32 *secid) 5241static int selinux_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)
5242{ 5242{
5243 return security_context_to_sid(secdata, seclen, secid); 5243 return security_context_to_sid(secdata, seclen, secid);
5244} 5244}
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index cdb14add27d2..ad30ac4273d6 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -96,7 +96,7 @@ int security_sid_to_context(u32 sid, char **scontext,
96int security_context_to_sid(const char *scontext, u32 scontext_len, 96int security_context_to_sid(const char *scontext, u32 scontext_len,
97 u32 *out_sid); 97 u32 *out_sid);
98 98
99int security_context_to_sid_default(char *scontext, u32 scontext_len, 99int security_context_to_sid_default(const char *scontext, u32 scontext_len,
100 u32 *out_sid, u32 def_sid, gfp_t gfp_flags); 100 u32 *out_sid, u32 def_sid, gfp_t gfp_flags);
101 101
102int security_get_user_sids(u32 callsid, char *username, 102int security_get_user_sids(u32 callsid, char *username,
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 25cac5a2aa8e..dcc2e1c4fd83 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -858,8 +858,8 @@ int security_context_to_sid(const char *scontext, u32 scontext_len, u32 *sid)
858 * Returns -%EINVAL if the context is invalid, -%ENOMEM if insufficient 858 * Returns -%EINVAL if the context is invalid, -%ENOMEM if insufficient
859 * memory is available, or 0 on success. 859 * memory is available, or 0 on success.
860 */ 860 */
861int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *sid, 861int security_context_to_sid_default(const char *scontext, u32 scontext_len,
862 u32 def_sid, gfp_t gfp_flags) 862 u32 *sid, u32 def_sid, gfp_t gfp_flags)
863{ 863{
864 return security_context_to_sid_core(scontext, scontext_len, 864 return security_context_to_sid_core(scontext, scontext_len,
865 sid, def_sid, gfp_flags); 865 sid, def_sid, gfp_flags);
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 5d2ec5650e61..92baee53a7dc 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2406,7 +2406,7 @@ static int smack_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
2406 * 2406 *
2407 * Exists for audit and networking code. 2407 * Exists for audit and networking code.
2408 */ 2408 */
2409static int smack_secctx_to_secid(char *secdata, u32 seclen, u32 *secid) 2409static int smack_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)
2410{ 2410{
2411 *secid = smack_to_secid(secdata); 2411 *secid = smack_to_secid(secdata);
2412 return 0; 2412 return 0;