crypto: api - Add crypto_request_clone and fb
Herbert Xu
maintainercover crypto: api - Add crypto_request_clone and fb
This series moves the common request cloning and fb code into the Crypto API.
Herbert Xu (2):
crypto: api - Add crypto_request_clone and fb
crypto: hash - Fix clone error handling
crypto/acompress.c | 29 ++-------------- crypto/ahash.c | 51 +++++++++++++---------------- crypto/api.c | 20 ++++++++++- crypto/shash.c | 3 ++ include/crypto/acompress.h | 9 +++-- include/crypto/hash.h | 9 +++-- include/crypto/internal/acompress.h | 7 +++- include/crypto/internal/hash.h | 7 +++- include/linux/crypto.h | 11 +++++-- 9 files changed, 79 insertions(+), 67 deletions(-)
base-commit: 63dc06cd12f980e304158888485a26ae2be7f371
Signature · 1 line
2.39.5
Herbert Xu
maintainerPATCH 1/2 crypto: api - Add crypto_request_clone and fb
Add a helper to clone crypto requests and eliminate code duplication. Use kmemdup in the helper.
Also add an fb field to crypto_tfm.
This also happens to fix the existing implementations which were buggy.
--- crypto/acompress.c | 29 +++----------------------- crypto/ahash.c | 32 +++++------------------------ crypto/api.c | 18 ++++++++++++++++ include/crypto/acompress.h | 9 +++++--- include/crypto/hash.h | 9 +++++--- include/crypto/internal/acompress.h | 7 ++++++- include/crypto/internal/hash.h | 7 ++++++- include/linux/crypto.h | 11 +++++++--- 8 files changed, 58 insertions(+), 64 deletions(-)
crypto/acompress.c +3 -26
@@ -11,15 +11,13 @@#include <crypto/scatterwalk.h> #include <linux/cryptouser.h> #include <linux/cpumask.h> -#include <linux/errno.h> +#include <linux/err.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/page-flags.h> #include <linux/percpu.h> #include <linux/scatterlist.h> #include <linux/sched.h> #include <linux/seq_file.h> -#include <linux/slab.h> #include <linux/smp.h> #include <linux/spinlock.h> #include <linux/string.h>
@@ -79,7 +77,7 @@ static void crypto_acomp_exit_tfm(struct crypto_tfm *tfm) alg->exit (acomp);if (acomp_is_async (acomp)) -crypto_free_acomp (acomp->fb); +crypto_free_acomp (crypto_acomp_fb (acomp)); }static int crypto_acomp_init_tfm (struct crypto_tfm *tfm)
@@ -89,8 +87,6 @@ static int crypto_acomp_init_tfm(struct crypto_tfm *tfm)struct crypto_acomp *fb =NULL ;int err; - acomp->fb = acomp; -if (tfm->__crt_alg->cra_type != &crypto_acomp_type)return crypto_init_scomp_ops_async (tfm);
@@ -104,7 +100,7 @@ static int crypto_acomp_init_tfm(struct crypto_tfm *tfm)if (crypto_acomp_reqsize (fb) >MAX_SYNC_COMP_REQSIZE ) goto out_free_fb; - acomp->fb = fb; + tfm->fb =crypto_acomp_tfm (fb); } acomp->compress = alg->compress;
@@ -570,24 +566,5 @@ int acomp_walk_virt(struct acomp_walk *__restrict walk, }EXPORT_SYMBOL_GPL (acomp_walk_virt); -struct acomp_req *acomp_request_clone (struct acomp_req *req, -size_t total,gfp_t gfp) -{ -struct crypto_acomp *tfm =crypto_acomp_reqtfm (req); -struct acomp_req *nreq; - - nreq =kmalloc (total, gfp); -if (!nreq) { -acomp_request_set_tfm (req, tfm->fb); - req->base.flags =CRYPTO_TFM_REQ_ON_STACK ; -return req; - } - -memcpy (nreq, req, total); -acomp_request_set_tfm (req, tfm); -return req; -} -EXPORT_SYMBOL_GPL (acomp_request_clone); -MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Asynchronous compression type" );
crypto/ahash.c +5 -27
@@ -12,13 +12,11 @@* Copyright (c) 2008 Loc Ho <[email protected]> */ -#include <crypto/scatterwalk.h> #include <linux/cryptouser.h> #include <linux/err.h> #include <linux/kernel.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/sched.h> #include <linux/slab.h> #include <linux/seq_file.h> #include <linux/string.h>
@@ -301,7 +299,8 @@ int crypto_ahash_setkey(struct crypto_ahash *tfm, const u8 *key, err = alg->setkey (tfm, key, keylen);if (!err &&ahash_is_async (tfm)) - err =crypto_ahash_setkey (tfm->fb, key, keylen); + err =crypto_ahash_setkey (crypto_ahash_fb (tfm), + key, keylen);if (unlikely (err)) {ahash_set_needkey (tfm, alg);return err;
@@ -732,7 +731,7 @@ static void crypto_ahash_exit_tfm(struct crypto_tfm *tfm) tfm->__crt_alg->cra_exit (tfm);if (ahash_is_async (hash)) -crypto_free_ahash (hash->fb); +crypto_free_ahash (crypto_ahash_fb (hash)); }static int crypto_ahash_init_tfm (struct crypto_tfm *tfm)
@@ -745,8 +744,6 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)crypto_ahash_set_statesize (hash, alg->halg.statesize);crypto_ahash_set_reqsize (hash,crypto_tfm_alg_reqsize (tfm)); - hash->fb = hash; -if (tfm->__crt_alg->cra_type == &crypto_shash_type)return crypto_init_ahash_using_shash (tfm);
@@ -756,7 +753,7 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)if (IS_ERR (fb))return PTR_ERR (fb); - hash->fb = fb; + tfm->fb =crypto_ahash_tfm (fb); }ahash_set_needkey (hash, alg);
@@ -1036,7 +1033,7 @@ EXPORT_SYMBOL_GPL(ahash_request_free);int crypto_hash_digest (struct crypto_ahash *tfm,const u8 *data,unsigned int len,u8 *out) { -HASH_REQUEST_ON_STACK (req, tfm->fb); +HASH_REQUEST_ON_STACK (req,crypto_ahash_fb (tfm));int err;ahash_request_set_callback (req,0 ,NULL ,NULL );
@@ -1049,24 +1046,5 @@ int crypto_hash_digest(struct crypto_ahash *tfm, const u8 *data, }EXPORT_SYMBOL_GPL (crypto_hash_digest); -struct ahash_request *ahash_request_clone (struct ahash_request *req, -size_t total,gfp_t gfp) -{ -struct crypto_ahash *tfm =crypto_ahash_reqtfm (req); -struct ahash_request *nreq; - - nreq =kmalloc (total, gfp); -if (!nreq) { -ahash_request_set_tfm (req, tfm->fb); - req->base.flags =CRYPTO_TFM_REQ_ON_STACK ; -return req; - } - -memcpy (nreq, req, total); -ahash_request_set_tfm (req, tfm); -return req; -} -EXPORT_SYMBOL_GPL (ahash_request_clone); -MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Asynchronous cryptographic hash type" );
crypto/api.c +18 -0
@@ -528,6 +528,7 @@ void *crypto_create_tfm_node(struct crypto_alg *alg, goto out; tfm = (struct crypto_tfm *)(mem + frontend->tfmsize); + tfm->fb = tfm; err = frontend->init_tfm (tfm);if (err)
@@ -712,5 +713,22 @@ void crypto_destroy_alg(struct crypto_alg *alg) }EXPORT_SYMBOL_GPL (crypto_destroy_alg); +struct crypto_async_request *crypto_request_clone ( +struct crypto_async_request *req,size_t total,gfp_t gfp) +{ +struct crypto_tfm *tfm = req->tfm; +struct crypto_async_request *nreq; + + nreq =kmemdup (req, total, gfp); +if (!nreq) { + req->tfm = tfm->fb; +return req; + } + + nreq->flags &= ~CRYPTO_TFM_REQ_ON_STACK ; +return nreq; +} +EXPORT_SYMBOL_GPL (crypto_request_clone); +MODULE_DESCRIPTION ("Cryptographic core API" );MODULE_LICENSE ("GPL" );
include/crypto/acompress.h +6 -3
@@ -114,7 +114,6 @@ struct crypto_acomp {int (*compress)(struct acomp_req *req);int (*decompress)(struct acomp_req *req);unsigned int reqsize; -struct crypto_acomp *fb;struct crypto_tfm base; };
@@ -553,7 +552,11 @@ static inline struct acomp_req *acomp_request_on_stack_init(return req; } -struct acomp_req *acomp_request_clone (struct acomp_req *req, -size_t total,gfp_t gfp); +static inline struct acomp_req *acomp_request_clone (struct acomp_req *req, +size_t total,gfp_t gfp) +{ +return container_of (crypto_request_clone (&req->base, total, gfp), + struct acomp_req, base); +}#endif
include/crypto/hash.h +6 -3
@@ -246,7 +246,6 @@ struct crypto_ahash {bool using_shash;/* Underlying algorithm is shash, not ahash */ unsigned int statesize;unsigned int reqsize; -struct crypto_ahash *fb;struct crypto_tfm base; };
@@ -1035,7 +1034,11 @@ static inline struct ahash_request *ahash_request_on_stack_init(return req; } -struct ahash_request *ahash_request_clone (struct ahash_request *req, -size_t total,gfp_t gfp); +static inline struct ahash_request *ahash_request_clone ( +struct ahash_request *req,size_t total,gfp_t gfp) +{ +return container_of (crypto_request_clone (&req->base, total, gfp), + struct ahash_request, base); +}#endif /* _CRYPTO_HASH_H */
include/crypto/internal/acompress.h +6 -1
@@ -220,13 +220,18 @@ static inline u32 acomp_request_flags(struct acomp_req *req)return crypto_request_flags (&req->base) & ~CRYPTO_ACOMP_REQ_PRIVATE ; } +static inline struct crypto_acomp *crypto_acomp_fb (struct crypto_acomp *tfm) +{ +return __crypto_acomp_tfm (crypto_acomp_tfm (tfm)->fb); +} +static inline struct acomp_req *acomp_fbreq_on_stack_init (char *buf,struct acomp_req *old) {struct crypto_acomp *tfm =crypto_acomp_reqtfm (old);struct acomp_req *req = (void *)buf; -acomp_request_set_tfm (req, tfm->fb); +acomp_request_set_tfm (req,crypto_acomp_fb (tfm)); req->base.flags =CRYPTO_TFM_REQ_ON_STACK ;acomp_request_set_callback (req,acomp_request_flags (old),NULL ,NULL ); req->base.flags &= ~CRYPTO_ACOMP_REQ_PRIVATE ;
include/crypto/internal/hash.h +6 -1
@@ -272,13 +272,18 @@ static inline bool crypto_ahash_req_chain(struct crypto_ahash *tfm)return crypto_tfm_req_chain (&tfm->base); } +static inline struct crypto_ahash *crypto_ahash_fb (struct crypto_ahash *tfm) +{ +return __crypto_ahash_cast (crypto_ahash_tfm (tfm)->fb); +} +static inline struct ahash_request *ahash_fbreq_on_stack_init (char *buf,struct ahash_request *old) {struct crypto_ahash *tfm =crypto_ahash_reqtfm (old);struct ahash_request *req = (void *)buf; -ahash_request_set_tfm (req, tfm->fb); +ahash_request_set_tfm (req,crypto_ahash_fb (tfm)); req->base.flags =CRYPTO_TFM_REQ_ON_STACK ;ahash_request_set_callback (req,ahash_request_flags (old),NULL ,NULL ); req->base.flags &= ~CRYPTO_AHASH_REQ_PRIVATE ;
include/linux/crypto.h +8 -3
@@ -14,7 +14,7 @@#include <linux/completion.h> #include <linux/errno.h> -#include <linux/refcount.h> +#include <linux/refcount_types.h> #include <linux/slab.h> #include <linux/types.h>
@@ -411,9 +411,11 @@ struct crypto_tfm {u32 crt_flags;int node; - + +struct crypto_tfm *fb; +void (*exit)(struct crypto_tfm *tfm); - +struct crypto_alg *__crt_alg; void *__crt_ctx[] CRYPTO_MINALIGN_ATTR;
@@ -509,5 +511,8 @@ static inline void crypto_request_set_tfm(struct crypto_async_request *req, req->flags &= ~CRYPTO_TFM_REQ_ON_STACK; } +struct crypto_async_request *crypto_request_clone ( +struct crypto_async_request *req,size_t total,gfp_t gfp); +#endif /* _LINUX_CRYPTO_H */
Signature · 1 line
2.39.5
Herbert Xu
maintainerPATCH 2/2 crypto: hash - Fix clone error handling
In reply to Herbert XuDo not copy the exit function in crypto_clone_tfm as it should only be set after init_tfm or clone_tfm has succeeded.
Move the setting into crypto_clone_ahash and crypto_clone_shash instead.
Also clone the fb if necessary.
--- crypto/ahash.c | 19 +++++++++++++++++-- crypto/api.c | 2 +- crypto/shash.c | 3 +++ 3 files changed, 21 insertions(+), 3 deletions(-)
crypto/ahash.c +17 -2
@@ -877,6 +877,7 @@ struct crypto_ahash *crypto_clone_ahash(struct crypto_ahash *hash) {struct hash_alg_common *halg =crypto_hash_alg_common (hash);struct crypto_tfm *tfm =crypto_ahash_tfm (hash); +struct crypto_ahash *fb =NULL ;struct crypto_ahash *nhash;struct ahash_alg *alg;int err;
@@ -906,22 +907,36 @@ struct crypto_ahash *crypto_clone_ahash(struct crypto_ahash *hash) err =PTR_ERR (shash); goto out_free_nhash; } +crypto_ahash_tfm (nhash)->exit = crypto_exit_ahash_using_shash; nhash->using_shash = true; *nctx = shash;return nhash; } +if (ahash_is_async (hash)) { + fb =crypto_clone_ahash (crypto_ahash_fb (hash)); + err =PTR_ERR (fb); +if (IS_ERR (fb)) + goto out_free_nhash; + +crypto_ahash_tfm (nhash)->fb =crypto_ahash_tfm (fb); + } + err = -ENOSYS ; alg =crypto_ahash_alg (hash);if (!alg->clone_tfm) - goto out_free_nhash; + goto out_free_fb; err = alg->clone_tfm (nhash, hash);if (err) - goto out_free_nhash; + goto out_free_fb; + +crypto_ahash_tfm (nhash)->exit = crypto_ahash_exit_tfm;return nhash; +out_free_fb: +crypto_free_ahash (fb); out_free_nhash:crypto_free_ahash (nhash);return ERR_PTR (err);
crypto/api.c +1 -1
@@ -570,7 +570,7 @@ void *crypto_clone_tfm(const struct crypto_type *frontend, tfm = (struct crypto_tfm *)(mem + frontend->tfmsize); tfm->crt_flags = otfm->crt_flags; - tfm->exit = otfm->exit; + tfm->fb = tfm; out:return mem;
crypto/shash.c +3 -0
@@ -413,6 +413,9 @@ struct crypto_shash *crypto_clone_shash(struct crypto_shash *hash) } } +if (alg->exit_tfm) +crypto_shash_tfm (nhash)->exit = crypto_shash_exit_tfm; +return nhash; }EXPORT_SYMBOL_GPL (crypto_clone_shash);
Signature · 1 line
2.39.5