diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 19:57:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 19:57:31 +0200 |
| commit | c8924234bd9c06fe86bae648c472d56cb10640a5 (patch) | |
| tree | b7ecba9e5fd1f7c451f00fc52a98c321153cc522 /net/ceph/crypto.c | |
| parent | Merge tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | libceph: fix crypto key null deref, memory leak (diff) | |
| download | linux-c8924234bd9c06fe86bae648c472d56cb10640a5.tar.xz linux-c8924234bd9c06fe86bae648c472d56cb10640a5.zip | |
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/ceph/crypto.c')
| -rw-r--r-- | net/ceph/crypto.c | 1 |
1 files changed, 1 insertions, 0 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 = { |