diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 21:57:31 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 21:57:31 +0400 |
| commit | c8924234bd9c06fe86bae648c472d56cb10640a5 (patch) | |
| tree | b7ecba9e5fd1f7c451f00fc52a98c321153cc522 /net | |
| parent | 410fc4ce8a373a3c35c73ac2c7c29f2bac6400bf (diff) | |
| parent | f0666b1ac875ff32fe290219b150ec62eebbe10e (diff) | |
| download | linux-c8924234bd9c06fe86bae648c472d56cb10640a5.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull two ceph fixes from Sage Weil:
"The first patch fixes up the old crufty open intent code to use the
atomic_open stuff properly, and the second fixes a possible null deref
and memory leak with the crypto keys."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: fix crypto key null deref, memory leak
ceph: simplify+fix atomic_open
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/crypto.c | 1 | ||||
| -rw-r--r-- | net/ceph/crypto.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c index b780cb7947dd..9da7fdd3cd8a 100644 --- a/net/ceph/crypto.c +++ b/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/net/ceph/crypto.h b/net/ceph/crypto.h index 1919d1550d75..3572dc518bc9 100644 --- a/net/ceph/crypto.h +++ b/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, |