apparmor: constify policy name and hname
Signed-off-by: John Johansen <john.johansen@canonical.com>
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index d7cfd79..96a02ee 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -38,7 +38,7 @@
*
* Returns: length of mangled name
*/
-static int mangle_name(char *name, char *target)
+static int mangle_name(const char *name, char *target)
{
char *t = target;
diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
index b5c16d3..7e81cda 100644
--- a/security/apparmor/include/lib.h
+++ b/security/apparmor/include/lib.h
@@ -123,8 +123,8 @@ static inline bool path_mediated_fs(struct dentry *dentry)
* @profiles: head of the profiles list contained in the object
*/
struct aa_policy {
- char *name;
- char *hname;
+ const char *name;
+ const char *hname;
struct list_head list;
struct list_head profiles;
};
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index 0220388..91d5766 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -178,7 +178,7 @@ bool aa_policy_init(struct aa_policy *policy, const char *prefix,
policy->hname = kmalloc(strlen(prefix) + strlen(name) + 3,
GFP_KERNEL);
if (policy->hname)
- sprintf(policy->hname, "%s//%s", prefix, name);
+ sprintf((char *)policy->hname, "%s//%s", prefix, name);
} else
policy->hname = kstrdup(name, GFP_KERNEL);
if (!policy->hname)
