Skip to contentSkip to conversation

selinux: drop SECURITY_SELINUX_POLICYDB_VERSION_MAX

PATCH Applied [email protected] 3 participants 4 messages Aug 15, 2016 – Aug 19, 2016 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selinux: drop SECURITY_SELINUX_POLICYDB_VERSION_MAX

From: William Roberts <[email protected]>

Remove the SECURITY_SELINUX_POLICYDB_VERSION_MAX Kconfig option

Per: https://github.com/SELinuxProject/selinux/wiki/Kernel-Todo

This was only needed on Fedora 3 and 4 and just causes issues now, so drop it.

The MAX and MIN should just be whatever the kernel can support.

---
 security/selinux/Kconfig            | 38 -------------------------------------
 security/selinux/include/security.h |  4 ----
 2 files changed, 42 deletions(-)
security/selinux/Kconfig +0 -38
index 8691e92..ea7e3ef 100644
@@ -93,41 +93,3 @@ config SECURITY_SELINUX_CHECKREQPROT_VALUE
 	  via /selinux/checkreqprot if authorized by policy.
 
 	  If you are unsure how to answer this question, answer 0.
-
-config SECURITY_SELINUX_POLICYDB_VERSION_MAX
-	bool "NSA SELinux maximum supported policy format version"
-	depends on SECURITY_SELINUX
-	default n
-	help
-	  This option enables the maximum policy format version supported
-	  by SELinux to be set to a particular value.  This value is reported
-	  to userspace via /selinux/policyvers and used at policy load time.
-	  It can be adjusted downward to support legacy userland (init) that
-	  does not correctly handle kernels that support newer policy versions.
-
-	  Examples:
-	  For the Fedora Core 3 or 4 Linux distributions, enable this option
-	  and set the value via the next option. For Fedora Core 5 and later,
-	  do not enable this option.
-
-	  If you are unsure how to answer this question, answer N.
-
-config SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
-	int "NSA SELinux maximum supported policy format version value"
-	depends on SECURITY_SELINUX_POLICYDB_VERSION_MAX
-	range 15 23
-	default 19
-	help
-	  This option sets the value for the maximum policy format version
-	  supported by SELinux.
-
-	  Examples:
-	  For Fedora Core 3, use 18.
-	  For Fedora Core 4, use 19.
-
-	  If you are unsure how to answer this question, look for the
-	  policy format version supported by your policy toolchain, by
-	  running 'checkpolicy -V'. Or look at what policy you have
-	  installed under /etc/selinux/$SELINUXTYPE/policy, where
-	  SELINUXTYPE is defined in your /etc/selinux/config.
-
security/selinux/include/security.h +0 -4
index 38feb55..308a286 100644
@@ -39,11 +39,7 @@
 
 /* Range of policy versions we understand*/
 #define POLICYDB_VERSION_MIN   POLICYDB_VERSION_BASE
-#ifdef CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
-#define POLICYDB_VERSION_MAX	CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
-#else
 #define POLICYDB_VERSION_MAX	POLICYDB_VERSION_XPERMS_IOCTL
-#endif
 
 /* Mask for just the mount related flags */
 #define SE_MNTMASK	0x0f
Signature · 1 line
1.9.1
maintainer Applied
#1 lore raw
Quoted 9 lines · On Mon, Aug 15, 2016 at 3:42 PM, <[email protected]> wrote:

From: William Roberts <[email protected]>

Remove the SECURITY_SELINUX_POLICYDB_VERSION_MAX Kconfig option

Per: https://github.com/SELinuxProject/selinux/wiki/Kernel-Todo

This was only needed on Fedora 3 and 4 and just causes issues now, so drop it.

Quoted 7 lines

The MAX and MIN should just be whatever the kernel can support.

---
 security/selinux/Kconfig            | 38 -------------------------------------
 security/selinux/include/security.h |  4 ----
 2 files changed, 42 deletions(-)

Merged, thanks for the help!

Signature · 2 lines
paul moore
www.paul-moore.com
#2 lore raw
Quoted 8 lines · Paul Moore
Quoted 6 lines · On Mon, Aug 15, 2016 at 3:42 PM, <[email protected]> wrote:

From: William Roberts <[email protected]>

Remove the SECURITY_SELINUX_POLICYDB_VERSION_MAX Kconfig option

Per: https://github.com/SELinuxProject/selinux/wiki/Kernel-Todo

Quoted 8 lines
Quoted 8 lines

This was only needed on Fedora 3 and 4 and just causes issues now, so drop it.

The MAX and MIN should just be whatever the kernel can support.

---
 security/selinux/Kconfig            | 38

-------------------------------------

Quoted 4 lines
Quoted 2 lines
 security/selinux/include/security.h |  4 ----
 2 files changed, 42 deletions(-)

Merged, thanks for the help!

I plan on tinkering with some of the things on that list, hopefully I can help whittle it down.

Quoted 9 lines

--
paul moore
www.paul-moore.com
_______________________________________________
Selinux mailing list
[email protected]
To unsubscribe, send email to [email protected]. To get help, send an email containing "help" to

[email protected].

maintainer
#3 lore raw
Quoted 21 lines · William Roberts
Quoted 20 lines · Paul Moore
Quoted 17 lines · On Mon, Aug 15, 2016 at 3:42 PM, <[email protected]> wrote:

From: William Roberts <[email protected]>

Remove the SECURITY_SELINUX_POLICYDB_VERSION_MAX Kconfig option

Per: https://github.com/SELinuxProject/selinux/wiki/Kernel-Todo

This was only needed on Fedora 3 and 4 and just causes issues now, so drop it.

The MAX and MIN should just be whatever the kernel can support.

---
 security/selinux/Kconfig            | 38
-------------------------------------
 security/selinux/include/security.h |  4 ----
 2 files changed, 42 deletions(-)
Quoted 4 lines
Quoted 1 line

Merged, thanks for the help!

I plan on tinkering with some of the things on that list, hopefully I can help whittle it down.

That would be great, thank you.

Signature · 2 lines
paul moore
www.paul-moore.com