Skip to contentSkip to conversation

SECURITY_ROOTPLUG must depend on USB

PATCH Applied Adrian Bunk 3 participants 4 messages Jun 1, 2003 – Jun 2, 2003 Security (LSM)

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 SECURITY_ROOTPLUG must depend on USB

The following patch lets SECURITY_ROOTPLUG depend on USB (otherwise there are link errors since Root Plug Support needs usb_bus_list{,_lock}):

security/Kconfig renamed from security/Kconfig.old +1 -1
@@ -33,7 +33,7 @@
 
 config SECURITY_ROOTPLUG
 	tristate "Root Plug Support"
-	depends on SECURITY!=n
+	depends on USB && SECURITY!=n
 	help
 	  This is a sample LSM module that should only be used as such.
 	  It prevents any programs running with egid == 0 if a specific

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
Applied
#1 lore raw
Quoted 3 lines · Adrian Bunk

The following patch lets SECURITY_ROOTPLUG depend on USB (otherwise there are link errors since Root Plug Support needs usb_bus_list{,_lock}):

Applied, thanks.

greg k-h

#2 lore raw
Quoted 6 lines · * Greg KH ([email protected]) wrote:
Quoted 3 lines · Adrian Bunk

The following patch lets SECURITY_ROOTPLUG depend on USB (otherwise there are link errors since Root Plug Support needs usb_bus_list{,_lock}):

Applied, thanks.

While we're at it, here's a tiny cleanup for a compile warning from John Cherry's build stats[1]. You may have a cleaner way you'd rather handle this.

CC [M] security/root_plug.o
security/root_plug.c:57:1: warning: "dbg" redefined
In file included from security/root_plug.c:30:
include/linux/usb.h:979:1: warning: this is the location of the previous definition

thanks,
-chris

[1] http://www.osdl.org/archive/cherry/stability/linux-2.5.69.results/2.5.69.allmodconfig.modules.txt

Signature · 15 lines
Linux Security Modules     http://lsm.immunix.org     http://lsm.bkbits.net

===== security/root_plug.c 1.2 vs edited =====
--- 1.2/security/root_plug.c	Wed Dec 18 15:09:26 2002
+++ edited/security/root_plug.c	Mon Jun  2 11:42:21 2003
@@ -54,6 +54,9 @@
 #define MY_NAME "root_plug"
 #endif
 
+#ifdef dbg
+#undef dbg
+#endif
 #define dbg(fmt, arg...)					\
 	do {							\
 		if (debug)					\
#3 lore raw
Quoted 11 lines · Chris Wright
Quoted 6 lines · * Greg KH ([email protected]) wrote:
Quoted 3 lines · Adrian Bunk

The following patch lets SECURITY_ROOTPLUG depend on USB (otherwise there are link errors since Root Plug Support needs usb_bus_list{,_lock}):

Applied, thanks.

While we're at it, here's a tiny cleanup for a compile warning from John Cherry's build stats[1]. You may have a cleaner way you'd rather handle this.

Thanks, but I already sent Linus a patch to clean this up in a different way.

greg k-h