Skip to contentSkip to conversation

Security: key: keyring: fix code style issues

PATCH James Kosin 2 participants 3 messages Mar 8, 2010 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

See below my comments,

James Kosin

Quoted 25 lines · Chihau Chau

From: Chihau Chau <[email protected]>

This fixes some code style issues like to include <linux/uaccess.h> instead <asm/uaccess.h> and to remove some innecessary braces.

---
 security/keys/keyring.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
security/keys/keyring.c +1 -1
index e814d21..5a44965 100644
@@ -17,7 +17,7 @@
 #include <linux/seq_file.h>
 #include <linux/err.h>
 #include <keys/keyring-type.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include "internal.h"
 
 /*
@@ -170,12 +170,10 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)
 {

security/keys/keyring.c static void keyring_describe(const struct key *keyring, struct seq_file *m) · line 178

Quoted 10 lines
security/keys/keyring.c +2 -4
 	struct keyring_list *klist;
 
-	if (keyring->description) {
+	if (keyring->description)
 		seq_puts(m, keyring->description);
-	}
-	else {
+	else
 		seq_puts(m, "[anon]");
-	}

I'm just going to put my 2-cents in here.

a) removing the braces doesn't change the functionality here; HOWEVER,
b) it may introduce a serious BUG later.

The main reason is some people don't look carefully at code and often add statements inside an if else block ... and if not caught will change the meaning of the statements and the order of execution. The worst possible case is if the else {} block is matchable to another if statement above this... then the compiler never complains about the else without an if test.

I'm okay with changing this to be like below with the {} matching and in the same format if you like.

Quoted 13 lines
security/keys/keyring.c +1 -2
 	rcu_read_lock();
 	klist = rcu_dereference(keyring->payload.subscriptions);
@@ -775,8 +773,7 @@ int __key_link(struct key *keyring, struct key *key)
 		smp_wmb();
 		klist->nkeys++;
 		smp_wmb();
-	}
-	else {
+	} else {
 		/* grow the key list */
 		max = 4;
 		if (klist)

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 7 lines · Chihau Chau

Ok,

And What about to include <linux/uaccess.h> instead <asm/uaccess.h> ?

Thanks!

<--snip-->

It looks like the main branch is moving toward using <linux/uaccess.h> instead of the old <asm/uaccess.h> file; so, I'm okay with that.

James K.

#4 lore raw

Ok, Thank you, I will send a new version of the patch.

Regards.

2010/3/8 James Kosin <[email protected]>:

Quoted 15 lines · Chihau Chau
Quoted 7 lines

Ok,

And What about to include <linux/uaccess.h> instead <asm/uaccess.h> ?

Thanks!

<--snip-->

It looks like the main branch is moving toward using <linux/uaccess.h> instead of the old <asm/uaccess.h> file; so, I'm okay with that.

James K.

Signature · 1 line
Chihau Chau