From: John Johansen <john.johansen@canonical.com>
Date: Mon, 16 Jan 2017 08:42:30 +0000 (-0800)
Subject: apparmor: constify policy name and hname
X-Git-Tag: v4.11-rc1~138^2~77
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bbe4a7c8733c925b061dcce2d1af8926cefbe539;p=linux.git

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 d7cfd79d9857..96a02ee9c499 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 b5c16d3a7a18..7e81cdab4af0 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 02203889c3c8..91d5766d1c28 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)