1 files changed, 15 insertions, 18 deletions

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index dd7cd0f8e13c..2fb2bc9712ae 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"
 
 /*
@@ -39,7 +39,7 @@ static inline unsigned keyring_hash(const char *desc)
         unsigned bucket = 0;
 
         for (; *desc; desc++)
-                bucket += (unsigned char) *desc;
+                bucket += (unsigned char)*desc;
 
         return bucket & (KEYRING_NAME_HASH_SIZE - 1);
 }
@@ -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);
@@ -237,7 +235,7 @@ static long keyring_read(const struct key *keyring,
                 ret = qty;
         }
 
- error:
+error:
         return ret;
 
 } /* end keyring_read() */
@@ -306,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;
@@ -508,7 +506,7 @@ key_ref_t __keyring_search_one(key_ref_t keyring_ref,
         rcu_read_unlock();
         return ERR_PTR(-ENOKEY);
 
- found:
+found:
         atomic_inc(&key->usage);
         rcu_read_unlock();
         return make_key_ref(key, possessed);
@@ -565,7 +563,7 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check)
         read_unlock(&keyring_name_lock);
         keyring = ERR_PTR(-ENOKEY);
 
- error:
+error:
         return keyring;
 
 } /* end find_keyring_by_name() */
@@ -598,7 +596,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
         sp = 0;
 
         /* start processing a new keyring */
- descend:
+descend:
         if (test_bit(KEY_FLAG_REVOKED, &subtree->flags))
                 goto not_this_keyring;
 
@@ -607,7 +605,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
                 goto not_this_keyring;
         kix = 0;
 
- ascend:
+ascend:
         /* iterate through the remaining keys in this keyring */
         for (; kix < keylist->nkeys; kix++) {
                 key = keylist->keys[kix];
@@ -633,7 +631,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
 
         /* the keyring we're looking at was disqualified or didn't contain a
          * matching key */
- not_this_keyring:
+not_this_keyring:
         if (sp > 0) {
                 /* resume the checking of a keyring higher up in the tree */
                 sp--;
@@ -644,15 +642,15 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
 
         ret = 0; /* no cycles detected */
 
- error:
+error:
         rcu_read_unlock();
         return ret;
 
- too_deep:
+too_deep:
         ret = -ELOOP;
         goto error;
 
- cycle_detected:
+cycle_detected:
         ret = -EDEADLK;
         goto error;
 
@@ -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)