Skip to content

Commit

Permalink
Security: key: keyring: fix some code style issues
Browse files Browse the repository at this point in the history
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>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
Chihau Chau authored and James Morris committed Mar 9, 2010
1 parent c43a752 commit 512ea3b
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions security/keys/keyring.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*
Expand Down Expand Up @@ -304,7 +304,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;
Expand Down Expand Up @@ -773,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)
Expand Down

0 comments on commit 512ea3b

Please sign in to comment.