From a126a3e9254d4108cf6a5fbd861294ba1c49853a Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Mon, 17 Jan 2011 09:25:34 +0900
Subject: [PATCH] --- yaml --- r: 231957 b: refs/heads/master c:
 0e7491f685cbc962f2ef977f7b5f8ed0b3100e88 h: refs/heads/master i:   231955:
 94de7a8acb63ff088024dee52f7481c4e91dfe6b v: v3

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

diff --git a/[refs] b/[refs]
index 01d2234664d7..72da38a051aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35576eab390df313095306e2a8216134910e7014
+refs/heads/master: 0e7491f685cbc962f2ef977f7b5f8ed0b3100e88
diff --git a/trunk/security/keys/trusted_defined.c b/trunk/security/keys/trusted_defined.c
index 7b2179589063..f7d06776faf0 100644
--- a/trunk/security/keys/trusted_defined.c
+++ b/trunk/security/keys/trusted_defined.c
@@ -148,6 +148,11 @@ static int TSS_authhmac(unsigned char *digest, const unsigned char *key,
 		if (dlen == 0)
 			break;
 		data = va_arg(argp, unsigned char *);
+		if (!data) {
+			ret = -EINVAL;
+			va_end(argp);
+			goto out;
+		}
 		ret = crypto_shash_update(&sdesc->shash, data, dlen);
 		if (ret < 0) {
 			va_end(argp);