Skip to contentSkip to conversation

security/: possible cleanups

PATCH In review Adrian Bunk 3 participants 4 messages May 16, 2005 – May 30, 2005

Subsystems (2)
Security (LSM) Keys/keyrings
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 security/: possible cleanups

This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unused global function:
- keys/key.c: key_duplicate

Signed-off-by Adrian Bunk <[email protected]>

---

 security/keys/internal.h |    1 -
 security/keys/key.c      |    4 +++-
 security/keys/keyring.c  |    2 +-
 security/seclvl.c        |    4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)
security/keys/internal.h renamed from security/keys/internal.h.old +0 -1
@@ -25,7 +25,6 @@
 #define kdebug(FMT, a...)	do {} while(0)
 #endif
 
-extern struct key_type key_type_dead;
 extern struct key_type key_type_user;
 
 /*****************************************************************************/
security/keys/key.c renamed from security/keys/key.c.old +3 -1
@@ -35,7 +35,7 @@
 DECLARE_RWSEM(key_construction_sem);
 
 /* any key who's type gets unegistered will be re-typed to this */
-struct key_type key_type_dead = {
+static struct key_type key_type_dead = {
 	.name		= "dead",
 };
 

@@ -860,6 +860,7 @@
  * duplicate a key, potentially with a revised description
  * - must be supported by the keytype (keyrings for instance can be duplicated)
  */
+#if 0
 struct key *key_duplicate(struct key *source, const char *desc)
 {
 	struct key *key;

@@ -904,6 +905,7 @@
 	goto out;
 
 } /* end key_duplicate() */
+#endif  /*  0  */
 
 /*****************************************************************************/
 /*
security/keys/keyring.c renamed from security/keys/keyring.c.old +1 -1
@@ -69,7 +69,7 @@
  * semaphore to serialise link/link calls to prevent two link calls in parallel
  * introducing a cycle
  */
-DECLARE_RWSEM(keyring_serialise_link_sem);
+static DECLARE_RWSEM(keyring_serialise_link_sem);
 
 /*****************************************************************************/
 /*
security/seclvl.c renamed from security/seclvl.c.old +2 -2
@@ -122,7 +122,7 @@
  * kobject stuff
  */
 
-struct subsystem seclvl_subsys;
+static struct subsystem seclvl_subsys;
 
 struct seclvl_obj {
 	char *name;

@@ -179,7 +179,7 @@
 	.sysfs_ops = &seclvlfs_sysfs_ops
 };
 
-decl_subsys(seclvl, &seclvl_ktype, NULL);
+static decl_subsys(seclvl, &seclvl_ktype, NULL);
 
 /**
  * The actual security level.  Ranges between -1 and 2 inclusive.
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · * Adrian Bunk ([email protected]) wrote:

This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unused global function:
- keys/key.c: key_duplicate

Signed-off-by Adrian Bunk <[email protected]>

Ack for seclvl change.

Acked-by Chris Wright <[email protected]>

I see no issue with the keys changes, except I'd rather see key_duplicate removed entirely if it's not getting used. David, is there a plan to put it to use, or can Adrian remove it?

thanks,
-chris

Quoted 48 lines
security/keys/internal.h renamed from security/keys/internal.h.old +0 -1
@@ -25,7 +25,6 @@
 #define kdebug(FMT, a...)	do {} while(0)
 #endif
 
-extern struct key_type key_type_dead;
 extern struct key_type key_type_user;
 
 /*****************************************************************************/
security/keys/key.c renamed from security/keys/key.c.old +3 -1
@@ -35,7 +35,7 @@
 DECLARE_RWSEM(key_construction_sem);
 
 /* any key who's type gets unegistered will be re-typed to this */
-struct key_type key_type_dead = {
+static struct key_type key_type_dead = {
 	.name		= "dead",
 };
 

@@ -860,6 +860,7 @@
  * duplicate a key, potentially with a revised description
  * - must be supported by the keytype (keyrings for instance can be duplicated)
  */
+#if 0
 struct key *key_duplicate(struct key *source, const char *desc)
 {
 	struct key *key;

@@ -904,6 +905,7 @@
 	goto out;
 
 } /* end key_duplicate() */
+#endif  /*  0  */
 
 /*****************************************************************************/
 /*
security/keys/keyring.c renamed from security/keys/keyring.c.old +1 -1
@@ -69,7 +69,7 @@
  * semaphore to serialise link/link calls to prevent two link calls in parallel
  * introducing a cycle
  */
-DECLARE_RWSEM(keyring_serialise_link_sem);
+static DECLARE_RWSEM(keyring_serialise_link_sem);
 
 /*****************************************************************************/
 /*
maintainer
#2 lore raw
Quoted 3 lines · Chris Wright

I see no issue with the keys changes, except I'd rather see key_duplicate removed entirely if it's not getting used. David, is there a plan to put it to use, or can Adrian remove it?

There was a keyctl call for it, I thought. I wonder what happened to it. Let me think about what I want to do with it. Note that if key_duplicate() gets removed, then the key_type->duplicate() op may as well be rooted out and shot too.

The rest of the patch looks vaguely okay.

David

author
#3 lore raw
Quoted 10 lines · David Howells
Quoted 3 lines · Chris Wright

I see no issue with the keys changes, except I'd rather see key_duplicate removed entirely if it's not getting used. David, is there a plan to put it to use, or can Adrian remove it?

There was a keyctl call for it, I thought. I wonder what happened to it. Let me think about what I want to do with it. Note that if key_duplicate() gets removed, then the key_type->duplicate() op may as well be rooted out and shot too.

Have you thought about what to do with key_duplicate()?

Quoted 3 lines

The rest of the patch looks vaguely okay.

David

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