From 3f0c3dd5b230b8477a8a6299cdf6973197c2313f Mon Sep 17 00:00:00 2001
From: Roberto Sassu <roberto.sassu@polito.it>
Date: Mon, 27 Jun 2011 13:45:39 +0200
Subject: [PATCH] --- yaml --- r: 260907 b: refs/heads/master c:
 f91c2c5cfa2950a20265b45bcc13e49ed9e49aac h: refs/heads/master i:   260905:
 8376b62fc0795accfa5c655ab430b87e976fe3d8   260903:
 13164b8e14baf54b685d0acb24b80576e31630f9 v: v3

---
 [refs]                          | 2 +-
 trunk/security/keys/encrypted.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e2479418c238..0b2ba3f1c523 100644
--- 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
index b1cba5bf0a5e..37cd913f18ae 100644
--- 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;
 }