Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0666b1a authored by Sylvain Munaut's avatar Sylvain Munaut Committed by Sage Weil
Browse files

libceph: fix crypto key null deref, memory leak 



Avoid crashing if the crypto key payload was NULL, as when it was not correctly
allocated and initialized.  Also, avoid leaking it.

Signed-off-by: default avatarSylvain Munaut <tnt@246tNt.com>
Signed-off-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent 5ef50c3b

net/ceph/crypto.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

net/ceph/crypto.h

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ struct ceph_crypto_key { 


static inline void ceph_crypto_key_destroy(struct ceph_crypto_key *key)

{

	if (key)

		kfree(key->key);

}