summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger2010-03-05 06:59:03 +0100
committerJames Morris2010-03-07 23:33:53 +0100
commit634a539e16bd7a1ba31c3f832baa725565cc9f96 (patch)
treecdc26f167c3a2764fecdf3427b2303d28bf05671
parentSecurity: Fix some coding styles in security/keys/keyring.c (diff)
downloadkernel-qcow2-linux-634a539e16bd7a1ba31c3f832baa725565cc9f96.tar.gz
kernel-qcow2-linux-634a539e16bd7a1ba31c3f832baa725565cc9f96.tar.xz
kernel-qcow2-linux-634a539e16bd7a1ba31c3f832baa725565cc9f96.zip
selinux: const strings in tables
Several places strings tables are used that should be declared const. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--security/selinux/hooks.c2
-rw-r--r--security/selinux/include/initial_sid_to_string.h2
-rw-r--r--security/selinux/ss/policydb.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 9a2ee845e9d4..e1202cbceeee 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -329,7 +329,7 @@ extern int ss_initialized;
/* The file system's label must be initialized prior to use. */
-static char *labeling_behaviors[6] = {
+static const char *labeling_behaviors[6] = {
"uses xattr",
"uses transition SIDs",
"uses task SIDs",
diff --git a/security/selinux/include/initial_sid_to_string.h b/security/selinux/include/initial_sid_to_string.h
index d4fac82793ae..a59b64e3fd02 100644
--- a/security/selinux/include/initial_sid_to_string.h
+++ b/security/selinux/include/initial_sid_to_string.h
@@ -1,5 +1,5 @@
/* This file is automatically generated. Do not edit. */
-static char *initial_sid_to_string[] =
+static const char *initial_sid_to_string[] =
{
"null",
"kernel",
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index f03667213ea8..623619851892 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -40,7 +40,7 @@
#define _DEBUG_HASHES
#ifdef DEBUG_HASHES
-static char *symtab_name[SYM_NUM] = {
+static const char *symtab_name[SYM_NUM] = {
"common prefixes",
"classes",
"roles",