Skip to contentSkip to conversation

2.6.0-test5-bk update credits

PATCH New Chris Wright 1 participant 4 messages Sep 13, 2003

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 2.6.0-test5-bk update credits

Update CREDITS with new contact info.

 CREDITS |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
CREDITS renamed from CREDITS.credit +4 -4
@@ -3460,11 +3460,11 @@
 S: England
 
 N: Chris Wright
-E: [email protected]
+E: [email protected]
 D: hacking on LSM framework and security modules.
-S: c/o WireX
-S: 920 SW 3rd, Ste. 100
-S: Portland, OR 97204
+S: c/o OSDL
+S: 12725 SW Millikan Way, Suite 400
+S: Beaverton, OR 97005
 S: USA
 
 N: Frank Xia
#1 lore raw

PATCH 2/4 2.6.0-test5-bk Add LSM maintainer entry

Add LSM maintainer entry

 MAINTAINERS |    7 +++++++
 1 files changed, 7 insertions(+)
MAINTAINERS renamed from MAINTAINERS.maint +7 -0
@@ -1159,6 +1159,13 @@
 L:	[email protected]
 S:	Supported
 
+LINUX SECURITY MODULE (LSM) FRAMEWORK
+P:	Chris Wright
+M:	[email protected]
+L:	[email protected]
+W:	http://lsm.immunix.org
+S:	Supported
+
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP Dynamic Disks)
 P:	Richard Russon (FlatCap)
 M:	[email protected]
#2 lore raw

PATCH 3/4 2.6.0-test5-bk LSM comment fixup

From: John Levon <[email protected]>

LSM: Update comments in register_security to reflect reality

 security/security.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
security/security.c renamed from security/security.c.comment +2 -3
@@ -79,9 +79,8 @@
  * value passed to this function.  A call to unregister_security() should be
  * done to remove this security_options structure from the kernel.
  *
- * If the @ops structure does not contain function pointers for all hooks in
- * the structure, or there is already a security module registered with the
- * kernel, an error will be returned.  Otherwise 0 is returned on success.
+ * If there is already a security module registered with the kernel,
+ * an error will be returned.  Otherwise 0 is returned on success.
  */
 int register_security (struct security_operations *ops)
 {
#3 lore raw

PATCH 4/4 2.6.0-test5-bk root_plug fixup

From: bert hubert <[email protected]>

LSM: To recap, this patch allows root_plug to work again. It needs functions that used to reside in capability.c but linking in capability.c, disabled root_plug from loading, as a security module is already present then. This patch splits out the functions root_plug needs from capability.c.

 security/Makefile     |    6 
 security/capability.c |  328 ----------------------------------------------
 security/commoncap.c  |  353 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 356 insertions(+), 331 deletions(-)
security/Makefile renamed from security/Makefile.commoncap +3 -3
@@ -6,7 +6,7 @@
 
 # if we don't select a security model, use the default capabilities
 ifneq ($(CONFIG_SECURITY),y)
-obj-y		+= capability.o
+obj-y		+= commoncap.o capability.o
 endif
 
 # Object file lists
@@ -15,5 +15,5 @@
 ifeq ($(CONFIG_SECURITY_SELINUX),y)
 	obj-$(CONFIG_SECURITY_SELINUX)	+= selinux/built-in.o
 endif
-obj-$(CONFIG_SECURITY_CAPABILITIES)	+= capability.o
-obj-$(CONFIG_SECURITY_ROOTPLUG)		+= root_plug.o
+obj-$(CONFIG_SECURITY_CAPABILITIES)	+= commoncap.o capability.o
+obj-$(CONFIG_SECURITY_ROOTPLUG)		+= commoncap.o root_plug.o
security/capability.c renamed from security/capability.c.commoncap +0 -328

334 lines not on this page · raw message

security/commoncap.c renamed from security/commoncap.c.commoncap +353 -0

353 lines not on this page · raw message