linux-kernel - Re: [PATCH 6/6] KEYS: Do some whitespace cleanups

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 4 Aug 2009 13:46:18 -0500
From:	"Serge E. Hallyn" <serue@...ibm.com>
To:	David Howells <dhowells@...hat.com>
Cc:	torvalds@...l.org, akpm@...ux-foundation.org, jmorris@...ei.org,
	linux-kernel@...r.kernel.org, linux-security-module@...r.kernel.org
Subject: Re: [PATCH 6/6] KEYS: Do some whitespace cleanups

Quoting David Howells (dhowells@...hat.com):
> Do some whitespace cleanups in the key management code.
> 
> Signed-off-by: David Howells <dhowells@...hat.com>

(trivially correct of course)

Acked-by: Serge Hallyn <serue@...ibm.com>

> ---
> 
>  security/keys/proc.c |   12 +++---------
>  1 files changed, 3 insertions(+), 9 deletions(-)
> 
> 
> diff --git a/security/keys/proc.c b/security/keys/proc.c
> index 643ecf0..e4fde23 100644
> --- a/security/keys/proc.c
> +++ b/security/keys/proc.c
> @@ -194,11 +194,9 @@ static int proc_keys_show(struct seq_file *m, void *v)
>  	/* come up with a suitable timeout value */
>  	if (key->expiry == 0) {
>  		memcpy(xbuf, "perm", 5);
> -	}
> -	else if (now.tv_sec >= key->expiry) {
> +	} else if (now.tv_sec >= key->expiry) {
>  		memcpy(xbuf, "expd", 5);
> -	}
> -	else {
> +	} else {
>  		timo = key->expiry - now.tv_sec;
> 
>  		if (timo < 60)
> @@ -238,9 +236,7 @@ static int proc_keys_show(struct seq_file *m, void *v)
>  	seq_putc(m, '\n');
> 
>  	rcu_read_unlock();
> -
>  	return 0;
> -
>  }
> 
>  #endif /* CONFIG_KEYS_DEBUG_PROC_KEYS */
> @@ -266,6 +262,7 @@ static struct rb_node *key_user_first(struct rb_root *r)
>  	struct rb_node *n = rb_first(r);
>  	return __key_user_next(n);
>  }
> +
>  /*****************************************************************************/
>  /*
>   * implement "/proc/key-users" to provides a list of the key users
> @@ -273,7 +270,6 @@ static struct rb_node *key_user_first(struct rb_root *r)
>  static int proc_key_users_open(struct inode *inode, struct file *file)
>  {
>  	return seq_open(file, &proc_key_users_ops);
> -
>  }
> 
>  static void *proc_key_users_start(struct seq_file *p, loff_t *_pos)
> @@ -290,14 +286,12 @@ static void *proc_key_users_start(struct seq_file *p, loff_t *_pos)
>  	}
> 
>  	return _p;
> -
>  }
> 
>  static void *proc_key_users_next(struct seq_file *p, void *v, loff_t *_pos)
>  {
>  	(*_pos)++;
>  	return key_user_next((struct rb_node *) v);
> -
>  }
> 
>  static void proc_key_users_stop(struct seq_file *p, void *v)
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/