diff options
| author | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
| commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
| tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /security/keys/process_keys.c | |
| parent | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff) | |
| parent | 4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/keys/process_keys.c')
| -rw-r--r-- | security/keys/process_keys.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 06c2ccf26ed3..20a38fed61b1 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c | |||
| @@ -508,7 +508,7 @@ try_again: | |||
| 508 | 508 | ||
| 509 | ret = install_thread_keyring(); | 509 | ret = install_thread_keyring(); |
| 510 | if (ret < 0) { | 510 | if (ret < 0) { |
| 511 | key = ERR_PTR(ret); | 511 | key_ref = ERR_PTR(ret); |
| 512 | goto error; | 512 | goto error; |
| 513 | } | 513 | } |
| 514 | goto reget_creds; | 514 | goto reget_creds; |
| @@ -526,7 +526,7 @@ try_again: | |||
| 526 | 526 | ||
| 527 | ret = install_process_keyring(); | 527 | ret = install_process_keyring(); |
| 528 | if (ret < 0) { | 528 | if (ret < 0) { |
| 529 | key = ERR_PTR(ret); | 529 | key_ref = ERR_PTR(ret); |
| 530 | goto error; | 530 | goto error; |
| 531 | } | 531 | } |
| 532 | goto reget_creds; | 532 | goto reget_creds; |
| @@ -585,7 +585,7 @@ try_again: | |||
| 585 | 585 | ||
| 586 | case KEY_SPEC_GROUP_KEYRING: | 586 | case KEY_SPEC_GROUP_KEYRING: |
| 587 | /* group keyrings are not yet supported */ | 587 | /* group keyrings are not yet supported */ |
| 588 | key = ERR_PTR(-EINVAL); | 588 | key_ref = ERR_PTR(-EINVAL); |
| 589 | goto error; | 589 | goto error; |
| 590 | 590 | ||
| 591 | case KEY_SPEC_REQKEY_AUTH_KEY: | 591 | case KEY_SPEC_REQKEY_AUTH_KEY: |