From d4eb7f611750290910c82ddd0376fb77e1671d82 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 15 Nov 2011 22:09:45 +0000
Subject: [PATCH] --- yaml --- r: 275474 b: refs/heads/master c:
 9f35a33b8d06263a165efe3541d9aa0cdbd70b3b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4944d5f58837..96bbc25278d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37
+refs/heads/master: 9f35a33b8d06263a165efe3541d9aa0cdbd70b3b
diff --git a/trunk/security/keys/user_defined.c b/trunk/security/keys/user_defined.c
index 5b366d7af3c4..69ff52c08e97 100644
--- a/trunk/security/keys/user_defined.c
+++ b/trunk/security/keys/user_defined.c
@@ -102,7 +102,8 @@ int user_update(struct key *key, const void *data, size_t datalen)
 		key->expiry = 0;
 	}
 
-	kfree_rcu(zap, rcu);
+	if (zap)
+		kfree_rcu(zap, rcu);
 
 error:
 	return ret;