aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/keyring.c
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2010-04-21 03:02:11 -0400
committerJames Morris <jmorris@namei.org>2010-04-22 20:10:23 -0400
commitc5b60b5e67af8be4c58d3ffcc36894f69c4fbdc1 (patch)
tree5ca471fad635ee8d91a24c7b5448dbcad3de74ef /security/keys/keyring.c
parent822cceec7248013821d655545ea45d1c6a9d15b3 (diff)
security: whitespace coding style fixes
Whitespace coding style fixes. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/keyring.c')
-rw-r--r--security/keys/keyring.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index fe0763a18c17..ce7c44b857d0 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -39,7 +39,7 @@ static inline unsigned keyring_hash(const char *desc)
39 unsigned bucket = 0; 39 unsigned bucket = 0;
40 40
41 for (; *desc; desc++) 41 for (; *desc; desc++)
42 bucket += (unsigned char) *desc; 42 bucket += (unsigned char)*desc;
43 43
44 return bucket & (KEYRING_NAME_HASH_SIZE - 1); 44 return bucket & (KEYRING_NAME_HASH_SIZE - 1);
45} 45}
@@ -235,7 +235,7 @@ static long keyring_read(const struct key *keyring,
235 ret = qty; 235 ret = qty;
236 } 236 }
237 237
238 error: 238error:
239 return ret; 239 return ret;
240 240
241} /* end keyring_read() */ 241} /* end keyring_read() */
@@ -506,7 +506,7 @@ key_ref_t __keyring_search_one(key_ref_t keyring_ref,
506 rcu_read_unlock(); 506 rcu_read_unlock();
507 return ERR_PTR(-ENOKEY); 507 return ERR_PTR(-ENOKEY);
508 508
509 found: 509found:
510 atomic_inc(&key->usage); 510 atomic_inc(&key->usage);
511 rcu_read_unlock(); 511 rcu_read_unlock();
512 return make_key_ref(key, possessed); 512 return make_key_ref(key, possessed);
@@ -563,7 +563,7 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check)
563 read_unlock(&keyring_name_lock); 563 read_unlock(&keyring_name_lock);
564 keyring = ERR_PTR(-ENOKEY); 564 keyring = ERR_PTR(-ENOKEY);
565 565
566 error: 566error:
567 return keyring; 567 return keyring;
568 568
569} /* end find_keyring_by_name() */ 569} /* end find_keyring_by_name() */
@@ -596,7 +596,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
596 sp = 0; 596 sp = 0;
597 597
598 /* start processing a new keyring */ 598 /* start processing a new keyring */
599 descend: 599descend:
600 if (test_bit(KEY_FLAG_REVOKED, &subtree->flags)) 600 if (test_bit(KEY_FLAG_REVOKED, &subtree->flags))
601 goto not_this_keyring; 601 goto not_this_keyring;
602 602
@@ -605,7 +605,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
605 goto not_this_keyring; 605 goto not_this_keyring;
606 kix = 0; 606 kix = 0;
607 607
608 ascend: 608ascend:
609 /* iterate through the remaining keys in this keyring */ 609 /* iterate through the remaining keys in this keyring */
610 for (; kix < keylist->nkeys; kix++) { 610 for (; kix < keylist->nkeys; kix++) {
611 key = keylist->keys[kix]; 611 key = keylist->keys[kix];
@@ -631,7 +631,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
631 631
632 /* the keyring we're looking at was disqualified or didn't contain a 632 /* the keyring we're looking at was disqualified or didn't contain a
633 * matching key */ 633 * matching key */
634 not_this_keyring: 634not_this_keyring:
635 if (sp > 0) { 635 if (sp > 0) {
636 /* resume the checking of a keyring higher up in the tree */ 636 /* resume the checking of a keyring higher up in the tree */
637 sp--; 637 sp--;
@@ -642,15 +642,15 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
642 642
643 ret = 0; /* no cycles detected */ 643 ret = 0; /* no cycles detected */
644 644
645 error: 645error:
646 rcu_read_unlock(); 646 rcu_read_unlock();
647 return ret; 647 return ret;
648 648
649 too_deep: 649too_deep:
650 ret = -ELOOP; 650 ret = -ELOOP;
651 goto error; 651 goto error;
652 652
653 cycle_detected: 653cycle_detected:
654 ret = -EDEADLK; 654 ret = -EDEADLK;
655 goto error; 655 goto error;
656 656