Skip to contentSkip to conversation

selinux: make "selinux_policycap_names[]" const char *

PATCH Applied Alexey Dobriyan 2 participants 2 messages Nov 24, 2018 – Nov 26, 2018 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selinux: make "selinux_policycap_names[]" const char *

Those strings aren't written.

---

 security/selinux/include/security.h |    2 +-
 security/selinux/ss/services.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
security/selinux/include/security.h +1 -1
@@ -81,7 +81,7 @@ enum {
 };
 #define POLICYDB_CAPABILITY_MAX (__POLICYDB_CAPABILITY_MAX - 1)
 
-extern char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX];
+extern const char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX];
 
 /*
  * type_datum properties
security/selinux/ss/services.c +1 -1
@@ -71,7 +71,7 @@
 #include "audit.h"
 
 /* Policy capability names */
-char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX] = {
+const char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX] = {
 	"network_peer_controls",
 	"open_perms",
 	"extended_socket_class",
maintainer Applied
#1 lore raw
Quoted 9 lines · Alexey Dobriyan

Those strings aren't written.

---

 security/selinux/include/security.h |    2 +-
 security/selinux/ss/services.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Merged into selinux/next, thanks.

Quoted 22 lines
security/selinux/include/security.h +1 -1
@@ -81,7 +81,7 @@ enum {
 };
 #define POLICYDB_CAPABILITY_MAX (__POLICYDB_CAPABILITY_MAX - 1)
 
-extern char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX];
+extern const char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX];
 
 /*
  * type_datum properties
security/selinux/ss/services.c +1 -1
@@ -71,7 +71,7 @@
 #include "audit.h"
 
 /* Policy capability names */
-char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX] = {
+const char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX] = {
        "network_peer_controls",
        "open_perms",
        "extended_socket_class",
Signature · 2 lines
paul moore
www.paul-moore.com