---

yaml --- r: 275474 b: refs/heads/master c: 9f35a33 h: refs/heads/master v: v3
git-mirror · Nov 16, 2011 · d4eb7f6 · d4eb7f6
1 parent d90f3db
commit d4eb7f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;