---

yaml --- r: 321210 b: refs/heads/master c: f0666b1 h: refs/heads/master v: v3
git-mirror · Aug 2, 2012 · e24172d · e24172d
1 parent 5c592cf
commit e24172d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ef50c3bec20060bc114f62d6503c5d86d70bdd7
+refs/heads/master: f0666b1ac875ff32fe290219b150ec62eebbe10e
diff --git a/trunk/net/ceph/crypto.c b/trunk/net/ceph/crypto.c
@@ -466,6 +466,7 @@ void ceph_key_destroy(struct key *key) {
 	struct ceph_crypto_key *ckey = key->payload.data;
 
 	ceph_crypto_key_destroy(ckey);
+	kfree(ckey);
 }
 
 struct key_type key_type_ceph = {

diff --git a/trunk/net/ceph/crypto.h b/trunk/net/ceph/crypto.h
@@ -16,7 +16,8 @@ struct ceph_crypto_key {
 
 static inline void ceph_crypto_key_destroy(struct ceph_crypto_key *key)
 {
-	kfree(key->key);
+	if (key)
+		kfree(key->key);
 }
 
 extern int ceph_crypto_key_clone(struct ceph_crypto_key *dst,