AppArmor: add const qualifiers to string arrays

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: John Johansen <john.johansen@canonical.com>

diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
index 61344b56722e3b0106dba2bfa44ff0ecd3ed80c1..5ff67776a5ada1f69dd53ad2f88a9c3b3eeb9f44 100644 (file)
--- a/security/apparmor/audit.c
+++ b/security/apparmor/audit.c
@@ -19,7 +19,7 @@
 #include "include/audit.h"
 #include "include/policy.h"
 
-const char *op_table[] = {
+const char *const op_table[] = {
        "null",
 
        "sysctl",
@@ -73,7 +73,7 @@ const char *op_table[] = {
        "profile_remove"
 };
 
-const char *audit_mode_names[] = {
+const char *const audit_mode_names[] = {
        "normal",
        "quiet_denied",
        "quiet",
@@ -81,7 +81,7 @@ const char *audit_mode_names[] = {
        "all"
 };
 
-static char *aa_audit_type[] = {
+static const char *const aa_audit_type[] = {
        "AUDIT",
        "ALLOWED",
        "DENIED",

diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
index 9317cd81416cb96ca9294a11b46d0d77f4ca8c16..4ba78c203af1a98f4de541a60db7d7c64b8cac13 100644 (file)
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
@@ -25,7 +25,7 @@
 
 struct aa_profile;
 
-extern const char *audit_mode_names[];
+extern const char *const audit_mode_names[];
 #define AUDIT_MAX_INDEX 5
 
 enum audit_mode {
@@ -47,7 +47,7 @@ enum audit_type {
        AUDIT_APPARMOR_AUTO
 };
 
-extern const char *op_table[];
+extern const char *const op_table[];
 enum aa_ops {
        OP_NULL,
 

diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
index 9e18e9609e24017a4b478982ba8e78d0cb850a39..bda4569fdd838bf7fa0f86f98a9a193ad5172d8d 100644 (file)
--- a/security/apparmor/include/policy.h
+++ b/security/apparmor/include/policy.h
@@ -29,7 +29,7 @@
 #include "file.h"
 #include "resource.h"
 
-extern const char *profile_mode_names[];
+extern const char *const profile_mode_names[];
 #define APPARMOR_NAMES_MAX_INDEX 3
 
 #define COMPLAIN_MODE(_profile)        \

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 73288d0b541f14c3feb5b4a94a3773b71d8ab5e3..9064143830229eb17cc9a560effd6ebe34c773b1 100644 (file)
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -93,7 +93,7 @@
 /* root profile namespace */
 struct aa_namespace *root_ns;
 
-const char *profile_mode_names[] = {
+const char *const profile_mode_names[] = {
        "enforce",
        "complain",
        "kill",