Security: key: keyring: fix some code style issues
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>
This commit is contained in:
parent
c43a752347
commit
512ea3bc30
@ -17,7 +17,7 @@
|
|||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <keys/keyring-type.h>
|
#include <keys/keyring-type.h>
|
||||||
#include <asm/uaccess.h>
|
#include <linux/uaccess.h>
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -304,7 +304,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
|
|||||||
key_check(keyring);
|
key_check(keyring);
|
||||||
|
|
||||||
/* top keyring must have search permission to begin the search */
|
/* 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) {
|
if (err < 0) {
|
||||||
key_ref = ERR_PTR(err);
|
key_ref = ERR_PTR(err);
|
||||||
goto error;
|
goto error;
|
||||||
@ -773,8 +773,7 @@ int __key_link(struct key *keyring, struct key *key)
|
|||||||
smp_wmb();
|
smp_wmb();
|
||||||
klist->nkeys++;
|
klist->nkeys++;
|
||||||
smp_wmb();
|
smp_wmb();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
/* grow the key list */
|
/* grow the key list */
|
||||||
max = 4;
|
max = 4;
|
||||||
if (klist)
|
if (klist)
|
||||||
|
Loading…
Reference in New Issue
Block a user