From 160fe73ca3d9f2f52f50f451394c449605f19892 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Fri, 28 Sep 2012 12:20:02 +0100
Subject: [PATCH] --- yaml --- r: 344825 b: refs/heads/master c:
 a84a921978b7d56e0e4b87ffaca6367429b4d8ff h: refs/heads/master i:   344823:
 d53eca4c5eb5d22990184b9e76d859c88e0887e8 v: v3

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

diff --git a/[refs] b/[refs]
index f7cc8fca5bcf..0efcae05a216 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 631527703d1aa2f0c5dc2af0d998f4da95c83f0e
+refs/heads/master: a84a921978b7d56e0e4b87ffaca6367429b4d8ff
diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c
index 3364fbf46807..a0d373f76815 100644
--- a/trunk/security/keys/keyctl.c
+++ b/trunk/security/keys/keyctl.c
@@ -1112,12 +1112,12 @@ long keyctl_instantiate_key_iov(key_serial_t id,
 	ret = rw_copy_check_uvector(WRITE, _payload_iov, ioc,
 				    ARRAY_SIZE(iovstack), iovstack, &iov);
 	if (ret < 0)
-		return ret;
+		goto err;
 	if (ret == 0)
 		goto no_payload_free;
 
 	ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
-
+err:
 	if (iov != iovstack)
 		kfree(iov);
 	return ret;