1 files changed, 3 insertions, 4 deletions

diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 23c6e53c102c..c57802a164d5 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",
@@ -156,12 +156,11 @@ static int roles_init(struct policydb *p)
                 rc = -EINVAL;
                 goto out_free_role;
         }
-        key = kmalloc(strlen(OBJECT_R)+1, GFP_KERNEL);
+        key = kstrdup(OBJECT_R, GFP_KERNEL);
         if (!key) {
                 rc = -ENOMEM;
                 goto out_free_role;
         }
-        strcpy(key, OBJECT_R);
         rc = hashtab_insert(p->p_roles.table, key, role);
         if (rc)
                 goto out_free_key;
@@ -2195,7 +2194,7 @@ int policydb_read(struct policydb *p, void *fp)
                 rangetr_hash_eval(p->range_tr);
         }
 
-        p->type_attr_map = kmalloc(p->p_types.nprim*sizeof(struct ebitmap), GFP_KERNEL);
+        p->type_attr_map = kmalloc(p->p_types.nprim * sizeof(struct ebitmap), GFP_KERNEL);
         if (!p->type_attr_map)
                 goto bad;