Commit c35e03ea authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: api - Add scaffolding to change completion function signature 



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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4409c08d

include/crypto/algapi.h

+7 −0
Original line number Diff line number Diff line
@@ -302,4 +302,11 @@ enum { 
	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 */

include/linux/crypto.h

+6 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ struct crypto_async_request; 
struct crypto_tfm;

struct crypto_type;



typedef struct crypto_async_request crypto_completion_data_t;

typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err);



/**
@@ -595,6 +596,11 @@ struct crypto_wait { 
/*

 * 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);



static inline int crypto_wait_req(int err, struct crypto_wait *wait)