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

Commit 4c10928e authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman
Browse files

crypto: af_alg - Disallow multiple in-flight AIO requests 



[ Upstream commit 67b164a871af1d736f131fd6fe78a610909f06f3 ]

Having multiple in-flight AIO requests results in unpredictable
output because they all share the same IV.  Fix this by only allowing
one request at a time.

Fixes: 83094e5e ("crypto: af_alg - add async support to algif_aead")
Fixes: a596999b ("crypto: algif - change algif_skcipher to be asynchronous")
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ca3484d5

crypto/af_alg.c

+13 −1
Original line number Diff line number Diff line
@@ -1029,9 +1029,13 @@ EXPORT_SYMBOL_GPL(af_alg_sendpage); 
void af_alg_free_resources(struct af_alg_async_req *areq)

{

	struct sock *sk = areq->sk;

	struct af_alg_ctx *ctx;



	af_alg_free_areq_sgls(areq);

	sock_kfree_s(sk, areq, areq->areqlen);



	ctx = alg_sk(sk)->private;

	ctx->inflight = false;

}

EXPORT_SYMBOL_GPL(af_alg_free_resources);
@@ -1095,11 +1099,19 @@ EXPORT_SYMBOL_GPL(af_alg_poll); 
struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk,

					   unsigned int areqlen)

{

	struct af_alg_async_req *areq = sock_kmalloc(sk, areqlen, GFP_KERNEL);

	struct af_alg_ctx *ctx = alg_sk(sk)->private;

	struct af_alg_async_req *areq;



	/* Only one AIO request can be in flight. */

	if (ctx->inflight)

		return ERR_PTR(-EBUSY);



	areq = sock_kmalloc(sk, areqlen, GFP_KERNEL);

	if (unlikely(!areq))

		return ERR_PTR(-ENOMEM);



	ctx->inflight = true;



	areq->areqlen = areqlen;

	areq->sk = sk;

	areq->last_rsgl = NULL;

include/crypto/if_alg.h

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ struct af_alg_async_req { 
 *			recvmsg is invoked.

 * @init:		True if metadata has been sent.

 * @len:		Length of memory allocated for this data structure.

 * @inflight:		Non-zero when AIO requests are in flight.

 */

struct af_alg_ctx {

	struct list_head tsgl_list;
@@ -155,6 +156,8 @@ struct af_alg_ctx { 
	bool init;



	unsigned int len;



	unsigned int inflight;

};



int af_alg_register_type(const struct af_alg_type *type);