GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 18:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: api - Add scaffolding to change completion function signature

Browse source 
[ Upstream commit c35e03eaec ]

The crypto completion function currently takes a pointer to a
struct crypto_async_request object.  However, in reality the API
does not allow the use of any part of the object apart from the
data field.  For example, ahash/shash will create a fake object
on the stack to pass along a different data field.

This leads to potential bugs where the user may try to dereference
or otherwise use the crypto_async_request object.

This patch adds some temporary scaffolding so that the completion
function can take a void * instead.  Once affected users have been
converted this can be removed.

The helper crypto_request_complete will remain even after the
conversion is complete.  It should be used instead of calling
the completion function directly.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Stable-dep-of: 4140aafcff ("crypto: engine - fix crypto_queue backlog handling")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Herbert Xu 2023-01-31 16:01:45 +08:00 • committed by Justin Hammond
parent e3b20588d0
commit fe93b16290
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/crypto/algapi.h
View file

@ -256,4 +256,11 @@ enum {
CRYPTO_MSG_ALG_LOADED, CRYPTO_MSG_ALG_LOADED,
}; };
static inline void crypto_request_complete(struct crypto_async_request *req,
int err)
{
crypto_completion_t complete = req->complete;
complete(req, err);
}
#endif /* _CRYPTO_ALGAPI_H */ #endif /* _CRYPTO_ALGAPI_H */

6
include/linux/crypto.h
View file

@ -167,6 +167,7 @@ struct crypto_async_request;
struct crypto_tfm; struct crypto_tfm;
struct crypto_type; struct crypto_type;
typedef struct crypto_async_request crypto_completion_data_t;
typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err); typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err);
/** /**
@ -586,6 +587,11 @@ struct crypto_wait {
/* /*
* Async ops completion helper functioons * Async ops completion helper functioons
*/ */
static inline void *crypto_get_completion_data(crypto_completion_data_t *req)
{
return req->data;
}
void crypto_req_done(struct crypto_async_request *req, int err); void crypto_req_done(struct crypto_async_request *req, int err);
static inline int crypto_wait_req(int err, struct crypto_wait *wait) static inline int crypto_wait_req(int err, struct crypto_wait *wait)