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: 83094e5e9e49 ("crypto: af_alg - add async support to algif_aead")
Fixes: a596999b7ddf ("crypto: algif - change algif_skcipher to be asynchronous")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index ea6fb8e89d0653a7c4fc879a413013d5ad38c04c..68cc9290cabe9a9f8a264908466897f2f93e039d 100644 (file)
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -1116,9 +1116,13 @@ EXPORT_SYMBOL_GPL(af_alg_sendmsg);
 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);
 
@@ -1188,11 +1192,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->first_rsgl.sgl.sgt.sgl = areq->first_rsgl.sgl.sgl;

diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index ef8ce86b1f7887f37ddf6d2d5bc1560aad44097c..08b803a4fcde4c07399b469b4cc4cebe8c4eef59 100644 (file)
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -136,6 +136,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;
@@ -154,6 +155,8 @@ struct af_alg_ctx {
        bool init;
 
        unsigned int len;
+
+       unsigned int inflight;
 };
 
 int af_alg_register_type(const struct af_alg_type *type);