---

yaml --- r: 260907 b: refs/heads/master c: f91c2c5 h: refs/heads/master i: 260905: 8376b62 260903: 13164b8 v: v3
git-mirror · Jun 27, 2011 · 3f0c3dd · 3f0c3dd
1 parent 061ba84
commit 3f0c3dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d67431f80b1b822f0286afc9123ee453eac7334
+refs/heads/master: f91c2c5cfa2950a20265b45bcc13e49ed9e49aac
diff --git a/trunk/security/keys/encrypted.c b/trunk/security/keys/encrypted.c
@@ -378,11 +378,13 @@ static struct key *request_master_key(struct encrypted_key_payload *epayload,
 	} else
 		goto out;
 
-	if (IS_ERR(mkey))
+	if (IS_ERR(mkey)) {
 		pr_info("encrypted_key: key %s not found",
 			epayload->master_desc);
-	if (mkey)
-		dump_master_key(*master_key, *master_keylen);
+		goto out;
+	}
+
+	dump_master_key(*master_key, *master_keylen);
 out:
 	return mkey;
 }