Patch "libceph: uninline ceph_crypto_key_destroy()" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
libceph: uninline ceph_crypto_key_destroy()
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libceph-uninline-ceph_crypto_key_destroy.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6db2304aabb070261ad34923bfd83c43dfb000e3Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <[email protected]>
Date: Fri, 2 Dec 2016 16:35:08 +0100
Subject: libceph: uninline ceph_crypto_key_destroy()
From: Ilya Dryomov <[email protected]>
commit 6db2304aabb070261ad34923bfd83c43dfb000e3 upstream.
--- net/ceph/crypto.c | 8 ++++++++ net/ceph/crypto.h | 9 +-------- 2 files changed, 9 insertions(+), 8 deletions(-)
net/ceph/crypto.c +8 -0
@@ -80,6 +80,14 @@ int ceph_crypto_key_unarmor(struct ceph_return 0 ; } +void ceph_crypto_key_destroy (struct ceph_crypto_key *key) +{ +if (key) { +kfree (key->key); + key->key =NULL ; + } +} +static struct crypto_skcipher *ceph_crypto_alloc_cipher (void ) {return crypto_alloc_skcipher ("cbc(aes)" ,0 ,CRYPTO_ALG_ASYNC );
net/ceph/crypto.h +1 -8
@@ -14,19 +14,12 @@ struct ceph_crypto_key {void *key; }; -static inline void ceph_crypto_key_destroy (struct ceph_crypto_key *key) -{ -if (key) { -kfree (key->key); - key->key =NULL ; - } -} -int ceph_crypto_key_clone (struct ceph_crypto_key *dst,const struct ceph_crypto_key *src);int ceph_crypto_key_encode (struct ceph_crypto_key *key,void **p,void *end);int ceph_crypto_key_decode (struct ceph_crypto_key *key,void **p,void *end);int ceph_crypto_key_unarmor (struct ceph_crypto_key *key,const char *in); +void ceph_crypto_key_destroy (struct ceph_crypto_key *key);/* crypto.c */ int ceph_crypt(const struct ceph_crypto_key *key, bool encrypt,
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/libceph-switch-ceph_x_decrypt-to-ceph_crypt.patch queue-4.9/libceph-introduce-ceph_x_encrypt_offset.patch queue-4.9/ceph-fix-endianness-of-getattr-mask-in-ceph_d_revalidate.patch queue-4.9/libceph-rename-and-align-ceph_x_authorizer-reply_buf.patch queue-4.9/libceph-ceph_x_encrypt_buflen-takes-in_len.patch queue-4.9/ceph-fix-endianness-bug-in-frag_tree_split_cmp.patch queue-4.9/libceph-uninline-ceph_crypto_key_destroy.patch queue-4.9/libceph-introduce-ceph_crypt-for-in-place-en-decryption.patch queue-4.9/libceph-make-sure-ceph_aes_crypt-iv-is-aligned.patch queue-4.9/ceph-fix-ceph_get_caps-interruption.patch queue-4.9/libceph-old_key-in-process_one_ticket-is-redundant.patch queue-4.9/libceph-tweak-calcu_signature-a-little.patch queue-4.9/libceph-remove-now-unused-ceph_-en-de-crypt-functions.patch queue-4.9/libceph-stop-allocating-a-new-cipher-on-every-crypto-request.patch queue-4.9/ceph-fix-bad-endianness-handling-in-parse_reply_info_extra.patch queue-4.9/libceph-switch-ceph_x_encrypt-to-ceph_crypt.patch