---

yaml --- r: 253948 b: refs/heads/master c: b1d7dd8 h: refs/heads/master v: v3
git-mirror · Jun 22, 2011 · 7c8ab4f · 7c8ab4f
1 parent e18bd1c
commit 7c8ab4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35052cffe0081904f3362c05818db900dd9dc7de
+refs/heads/master: b1d7dd80aadb9042e83f9778b484a2f92e0b04d4
diff --git a/trunk/security/keys/request_key.c b/trunk/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);