All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Security: key: keyring: fix code style issues
@ 2010-03-08 18:14 Chihau Chau
  0 siblings, 0 replies; 6+ messages in thread
From: Chihau Chau @ 2010-03-08 18:14 UTC (permalink / raw)
  To: jmorris
  Cc: dhowells, paulmck, mingo, linux-security-module, linux-kernel,
	Chihau Chau

From: Chihau Chau <chihau@gmail.com>

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

Signed-off-by: Chihau Chau <chihau@gmail.com>
---
 security/keys/keyring.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e814d21..5a44965 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -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)
 {
 	struct keyring_list *klist;
 
-	if (keyring->description) {
+	if (keyring->description)
 		seq_puts(m, keyring->description);
-	}
-	else {
+	else
 		seq_puts(m, "[anon]");
-	}
 
 	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)
-- 
1.5.6.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] Security: key: keyring: fix code style issues
       [not found] <emcYy-av-15@gated-at.bofh.it>
@ 2010-03-09 19:16 ` James Kosin
  0 siblings, 0 replies; 6+ messages in thread
From: James Kosin @ 2010-03-09 19:16 UTC (permalink / raw)
  To: linux-kernel

On 3/9/2010 2:10 PM, Chihau Chau wrote:
> From: Chihau Chau <chihau@gmail.com>
> 
> This fixes to include <linux/uaccess.h> instead <asm/uaccess.h> and some
> code style issues like to put a else sentence below close brace '}' and
> to replace a tab instead of some space characters.
> 
> Signed-off-by: Chihau Chau <chihau@gmail.com>

Reviewed-by: James Kosin <jkosin@intcomgrp.com>

> ---
>  security/keys/keyring.c |   10 ++++------
>  1 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/security/keys/keyring.c b/security/keys/keyring.c
> index e814d21..d8b5d5e 100644
> --- a/security/keys/keyring.c
> +++ b/security/keys/keyring.c
> @@ -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"
>  
>  /*
> @@ -172,8 +172,7 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)
>  
>  	if (keyring->description) {
>  		seq_puts(m, keyring->description);
> -	}
> -	else {
> +	} else {
>  		seq_puts(m, "[anon]");
>  	}
>  
> @@ -306,7 +305,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
>  	key_check(keyring);
>  
>  	/* top keyring must have search permission to begin the search */
> -        err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
> +	err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
>  	if (err < 0) {
>  		key_ref = ERR_PTR(err);
>  		goto error;
> @@ -775,8 +774,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)


^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH] Security: key: keyring: fix code style issues
@ 2010-03-09 19:03 Chihau Chau
  0 siblings, 0 replies; 6+ messages in thread
From: Chihau Chau @ 2010-03-09 19:03 UTC (permalink / raw)
  To: jmorris
  Cc: dhowells, paulmck, mingo, linux-security-module, linux-kernel,
	Chihau Chau

From: Chihau Chau <chihau@gmail.com>

This fixes to include <linux/uaccess.h> instead <asm/uaccess.h> and some
code style issues like to put a else sentence below close brace '}' and
to replace a tab instead of some space characters.

Signed-off-by: Chihau Chau <chihau@gmail.com>
---
 security/keys/keyring.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e814d21..d8b5d5e 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -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"
 
 /*
@@ -172,8 +172,7 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)
 
 	if (keyring->description) {
 		seq_puts(m, keyring->description);
-	}
-	else {
+	} else {
 		seq_puts(m, "[anon]");
 	}
 
@@ -306,7 +305,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
 	key_check(keyring);
 
 	/* top keyring must have search permission to begin the search */
-        err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
+	err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
 	if (err < 0) {
 		key_ref = ERR_PTR(err);
 		goto error;
@@ -775,8 +774,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)
-- 
1.5.6.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] Security: key: keyring: fix code style issues
  2010-03-08 21:33     ` James Kosin
@ 2010-03-08 23:03       ` Chihau Chau
  0 siblings, 0 replies; 6+ messages in thread
From: Chihau Chau @ 2010-03-08 23:03 UTC (permalink / raw)
  To: James Kosin; +Cc: linux-kernel

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

Regards.

2010/3/8 James Kosin <jkosin@intcomgrp.com>:
> On 3/8/2010 3:11 PM, Chihau Chau wrote:
>> 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.
>



-- 
Chihau Chau

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] Security: key: keyring: fix code style issues
       [not found]   ` <f5ca57691003081211g2dab077cv323138699ccd03b3@mail.gmail.com>
@ 2010-03-08 21:33     ` James Kosin
  2010-03-08 23:03       ` Chihau Chau
  0 siblings, 1 reply; 6+ messages in thread
From: James Kosin @ 2010-03-08 21:33 UTC (permalink / raw)
  To: Chihau Chau; +Cc: linux-kernel

On 3/8/2010 3:11 PM, Chihau Chau wrote:
> 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.

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] Security: key: keyring: fix code style issues
       [not found] <elPIC-7L6-15@gated-at.bofh.it>
@ 2010-03-08 19:15 ` James Kosin
       [not found]   ` <f5ca57691003081211g2dab077cv323138699ccd03b3@mail.gmail.com>
  0 siblings, 1 reply; 6+ messages in thread
From: James Kosin @ 2010-03-08 19:15 UTC (permalink / raw)
  To: linux-kernel

See below my comments,

James Kosin

On 3/8/2010 1:20 PM, Chihau Chau wrote:
> From: Chihau Chau <chihau@gmail.com>
> 
> This fixes some code style issues like to include <linux/uaccess.h> instead
> <asm/uaccess.h> and to remove some innecessary braces.
> 
> Signed-off-by: Chihau Chau <chihau@gmail.com>
> ---
>  security/keys/keyring.c |   11 ++++-------
>  1 files changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/security/keys/keyring.c b/security/keys/keyring.c
> index e814d21..5a44965 100644
> --- a/security/keys/keyring.c
> +++ b/security/keys/keyring.c
> @@ -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)
>  {
>  	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.

>  
>  	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)


^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-03-09 19:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-08 18:14 [PATCH] Security: key: keyring: fix code style issues Chihau Chau
     [not found] <elPIC-7L6-15@gated-at.bofh.it>
2010-03-08 19:15 ` James Kosin
     [not found]   ` <f5ca57691003081211g2dab077cv323138699ccd03b3@mail.gmail.com>
2010-03-08 21:33     ` James Kosin
2010-03-08 23:03       ` Chihau Chau
2010-03-09 19:03 Chihau Chau
     [not found] <emcYy-av-15@gated-at.bofh.it>
2010-03-09 19:16 ` James Kosin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.