diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 13:56:43 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-29 13:56:43 -0700 |
| commit | 5828e87bbcb3ae1c7741cae1c62b44e4979df429 (patch) | |
| tree | 2b678fc60cdeb294435dee64d551cbd03430804d /security | |
| parent | b10049da714e57153cacb7e31efc41a8ba0ae5d2 (diff) | |
| parent | e55d4fa96762fd767a3b6d842c904e994db6bb2e (diff) | |
| download | kernel_samsung_tuna-5828e87bbcb3ae1c7741cae1c62b44e4979df429.zip kernel_samsung_tuna-5828e87bbcb3ae1c7741cae1c62b44e4979df429.tar.gz kernel_samsung_tuna-5828e87bbcb3ae1c7741cae1c62b44e4979df429.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/request_key.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 8e319a4..8246532 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -469,7 +469,7 @@ static struct key *construct_key_and_link(struct key_type *type, } else if (ret == -EINPROGRESS) { ret = 0; } else { - key = ERR_PTR(ret); + goto couldnt_alloc_key; } key_put(dest_keyring); @@ -479,6 +479,7 @@ static struct key *construct_key_and_link(struct key_type *type, construction_failed: key_negate_and_link(key, key_negative_timeout, NULL, NULL); key_put(key); +couldnt_alloc_key: key_put(dest_keyring); kleave(" = %d", ret); return ERR_PTR(ret); |