diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 14:29:27 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-29 14:29:27 -0700 |
| commit | 9b0cd4ab4e84e5738c35bd93479ac8848ec58bad (patch) | |
| tree | 1e217d95e20a05f995eaaf751b1d1064f8c7eee6 /security | |
| parent | 7423276e38ec62563970456ec280cf5f922141dc (diff) | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
| download | kernel_samsung_tuna-9b0cd4ab4e84e5738c35bd93479ac8848ec58bad.zip kernel_samsung_tuna-9b0cd4ab4e84e5738c35bd93479ac8848ec58bad.tar.gz kernel_samsung_tuna-9b0cd4ab4e84e5738c35bd93479ac8848ec58bad.tar.bz2 | |
Merge commit 'v3.0-rc5' into linux-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); |