From ff01f8e7f50faacfdc28463c04b47d90721361e3 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 23 Jan 2011 22:40:42 +0100
Subject: [PATCH] --- yaml --- r: 232265 b: refs/heads/master c:
 5403110943a2dcf1f96416d7a412a8b46895facd h: refs/heads/master i:   232263:
 5ede9bf2dd4a03cc0682e76a1af4e5878da8f63b v: v3

---
 [refs]                        | 2 +-
 trunk/security/keys/trusted.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 31a1ad31b70a..6ab821c239cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f3c68bee977ab872827e44de017216736fe21d7
+refs/heads/master: 5403110943a2dcf1f96416d7a412a8b46895facd
diff --git a/trunk/security/keys/trusted.c b/trunk/security/keys/trusted.c
index 3066f56c7676..83fc92e297cd 100644
--- a/trunk/security/keys/trusted.c
+++ b/trunk/security/keys/trusted.c
@@ -1032,6 +1032,7 @@ static int trusted_update(struct key *key, const void *data, size_t datalen)
 	ret = datablob_parse(datablob, new_p, new_o);
 	if (ret != Opt_update) {
 		ret = -EINVAL;
+		kfree(new_p);
 		goto out;
 	}
 	/* copy old key values, and reseal with new pcrs */