Commit 90aa4f5e authored by Stephen Smalley's avatar Stephen Smalley Committed by Paul Moore
Browse files

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: default avatarStephen Smalley <stephen.smalley.work@gmail.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent c867248c

security/selinux/Kconfig

+8 −8
Original line number Diff line number Diff line 
# 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

security/selinux/hooks.c

+1 −1
Original line number Diff line number Diff line 
// 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.

 *

security/selinux/include/objsec.h

+1 −1
Original line number Diff line number Diff line 
/* 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.

 *

security/selinux/xfrm.c

+1 −1
Original line number Diff line number Diff line 
// 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.

 *