selinux: de-brand SELinux

Change "NSA SELinux" to just "SELinux" in Kconfig help text and
comments. While NSA was the original primary developer and continues to
help maintain SELinux, SELinux has long since transitioned to a wide
community of developers and maintainers. SELinux has been part of the
mainline Linux kernel for nearly 20 years now [1] and has received
contributions from many individuals and organizations.

[1] https://lore.kernel.org/lkml/Pine.LNX.4.44.0308082228470.1852-100000@home.osdl.org/

Signed-off-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
index 95a186ec0fcb70beb5f510563c3711ab5eb7ee7a..c275115b508848d564e3f8c111451b9285decf0b 100644 (file)
--- a/security/selinux/Kconfig
+++ b/security/selinux/Kconfig
@@ -1,16 +1,16 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config SECURITY_SELINUX
-       bool "NSA SELinux Support"
+       bool "SELinux Support"
        depends on SECURITY_NETWORK && AUDIT && NET && INET
        select NETWORK_SECMARK
        default n
        help
-         This selects NSA Security-Enhanced Linux (SELinux).
+         This selects Security-Enhanced Linux (SELinux).
          You will also need a policy configuration and a labeled filesystem.
          If you are unsure how to answer this question, answer N.
 
 config SECURITY_SELINUX_BOOTPARAM
-       bool "NSA SELinux boot parameter"
+       bool "SELinux boot parameter"
        depends on SECURITY_SELINUX
        default n
        help
@@ -24,11 +24,11 @@ config SECURITY_SELINUX_BOOTPARAM
          If you are unsure how to answer this question, answer N.
 
 config SECURITY_SELINUX_DEVELOP
-       bool "NSA SELinux Development Support"
+       bool "SELinux Development Support"
        depends on SECURITY_SELINUX
        default y
        help
-         This enables the development support option of NSA SELinux,
+         This enables the development support option of SELinux,
          which is useful for experimenting with SELinux and developing
          policies.  If unsure, say Y.  With this option enabled, the
          kernel will start in permissive mode (log everything, deny nothing)
@@ -38,7 +38,7 @@ config SECURITY_SELINUX_DEVELOP
          /sys/fs/selinux/enforce.
 
 config SECURITY_SELINUX_AVC_STATS
-       bool "NSA SELinux AVC Statistics"
+       bool "SELinux AVC Statistics"
        depends on SECURITY_SELINUX
        default y
        help
@@ -47,7 +47,7 @@ config SECURITY_SELINUX_AVC_STATS
          tools such as avcstat.
 
 config SECURITY_SELINUX_SIDTAB_HASH_BITS
-       int "NSA SELinux sidtab hashtable size"
+       int "SELinux sidtab hashtable size"
        depends on SECURITY_SELINUX
        range 8 13
        default 9
@@ -59,7 +59,7 @@ config SECURITY_SELINUX_SIDTAB_HASH_BITS
          will ensure that lookups times are short and stable.
 
 config SECURITY_SELINUX_SID2STR_CACHE_SIZE
-       int "NSA SELinux SID to context string translation cache size"
+       int "SELinux SID to context string translation cache size"
        depends on SECURITY_SELINUX
        default 256
        help

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index fff50604abce752cfd5fc45863d1d0678f67cb53..9aa60ce23209c4db2a8b92d9ea82a267bf934c5b 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- *  NSA Security-Enhanced Linux (SELinux) security module
+ *  Security-Enhanced Linux (SELinux) security module
  *
  *  This file contains the SELinux hook function implementations.
  *

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index 2953132408bf69235cddecf86f8f79bb8e0afd8c..8f50e8fe0488e7e998da717f00a38f0ef49c4573 100644 (file)
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- *  NSA Security-Enhanced Linux (SELinux) security module
+ *  Security-Enhanced Linux (SELinux) security module
  *
  *  This file contains the SELinux security data structures for kernel objects.
  *

diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c
index 1fca42c4d0ae36c753278c429d25ec6029fdb2d5..95fcd2d3433e4ba6a26ef92adb46835b1a4216b0 100644 (file)
--- a/security/selinux/xfrm.c
+++ b/security/selinux/xfrm.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- *  NSA Security-Enhanced Linux (SELinux) security module
+ *  Security-Enhanced Linux (SELinux) security module
  *
  *  This file contains the SELinux XFRM hook function implementations.
  *