From 416228d3e4ad948aed1af87ed252a6159659d933 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Tue, 18 Apr 2006 00:13:02 +0000 Subject: [PATCH] disable b0rked lsm modules svn path=/dists/trunk/linux-2.6/; revision=6439 --- debian/arch/arm/config.footbridge | 2 -- debian/arch/arm/config.ixp4xx | 1 - debian/arch/arm/config.nslu2 | 2 -- debian/arch/arm/config.rpc | 1 - debian/arch/arm/config.s3c2410 | 1 - debian/arch/armeb/config.nslu2 | 2 -- debian/arch/config | 4 ++-- debian/arch/mips/config.r4k-ip22 | 1 - debian/arch/mips/config.r5k-ip32 | 1 - debian/arch/mips/config.sb1-bcm91250a | 2 -- debian/arch/mips/config.sb1a-bcm91480b | 2 -- debian/arch/mipsel/config.r5k-cobalt | 2 -- debian/arch/mipsel/config.sb1-bcm91250a | 2 -- debian/arch/mipsel/config.sb1a-bcm91480b | 2 -- debian/changelog | 7 ++++++- 15 files changed, 8 insertions(+), 24 deletions(-) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 87a0f530b..8bfbe72d4 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1487,8 +1487,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index e049e26ab..528f35a2a 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1251,7 +1251,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2 index fdf5c0d1b..03752d8eb 100644 --- a/debian/arch/arm/config.nslu2 +++ b/debian/arch/arm/config.nslu2 @@ -1486,8 +1486,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index f0bb08ef7..5376b1ce4 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -973,7 +973,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index 8101bb9ac..91059209b 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -1037,7 +1037,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2 index 7e84de814..a5472eb97 100644 --- a/debian/arch/armeb/config.nslu2 +++ b/debian/arch/armeb/config.nslu2 @@ -1486,8 +1486,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/config b/debian/arch/config index ae0e97fe7..faa83db76 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -318,8 +318,8 @@ CONFIG_KEYS=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m +# CONFIG_SECURITY_ROOTPLUG is not set +# CONFIG_SECURITY_SECLVL is not set CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/mips/config.r4k-ip22 b/debian/arch/mips/config.r4k-ip22 index d12fd04e4..cd8b9c869 100644 --- a/debian/arch/mips/config.r4k-ip22 +++ b/debian/arch/mips/config.r4k-ip22 @@ -1341,7 +1341,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/mips/config.r5k-ip32 b/debian/arch/mips/config.r5k-ip32 index 4bc55ed4a..cb08a8a69 100644 --- a/debian/arch/mips/config.r5k-ip32 +++ b/debian/arch/mips/config.r5k-ip32 @@ -1461,7 +1461,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a index ea3567c88..f9ade0304 100644 --- a/debian/arch/mips/config.sb1-bcm91250a +++ b/debian/arch/mips/config.sb1-bcm91250a @@ -1794,8 +1794,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b index 15badc17d..973b5d03c 100644 --- a/debian/arch/mips/config.sb1a-bcm91480b +++ b/debian/arch/mips/config.sb1a-bcm91480b @@ -1794,8 +1794,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index b722a7654..809f8840b 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -1574,8 +1574,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a index 18f182a74..32cbb63e5 100644 --- a/debian/arch/mipsel/config.sb1-bcm91250a +++ b/debian/arch/mipsel/config.sb1-bcm91250a @@ -1794,8 +1794,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b index ac228384c..47c644a67 100644 --- a/debian/arch/mipsel/config.sb1a-bcm91480b +++ b/debian/arch/mipsel/config.sb1a-bcm91480b @@ -1794,8 +1794,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_ROOTPLUG=m -CONFIG_SECURITY_SECLVL=m CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/debian/changelog b/debian/changelog index 3f8f1b297..8098d35f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low + [ Bastian Blank ] * - -- Bastian Blank Fri, 14 Apr 2006 17:52:48 +0200 + [ maximilian attems ] + * Disable broken and known unsecure LSM modules: CONFIG_SECURITY_SECLVL, + CONFIG_SECURITY_ROOTPLUG. Upstream plans to remove them for 2.6.18 + + -- maximilian attems Tue, 18 Apr 2006 02:09:27 +0200 linux-2.6 (2.6.16-7) UNRELEASED; urgency=low