crypto: ccp - permit asynchronous skcipher as fallback

Even though the ccp driver implements an asynchronous version of xts(aes),
the fallback it allocates is required to be synchronous. Given that SIMD
based software implementations are usually asynchronous as well, even
though they rarely complete asynchronously (this typically only happens
in cases where the request was made from softirq context, while SIMD was
already in use in the task context that it interrupted), these
implementations are disregarded, and either the generic C version or
another table based version implemented in assembler is selected instead.

Since falling back to synchronous AES is not only a performance issue, but
potentially a security issue as well (due to the fact that table based AES
is not time invariant), let's fix this, by allocating an ordinary skcipher
as the fallback, and invoke it with the completion routine that was given
to the outer request.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: John Allen <john.allen@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccp/ccp-crypto-aes-xts.c b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
index 04b2517df9555456bd85bc9f1c6a00182c036b1c..959168a7ac59d75f627f2080f9f572f54156a72b 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-aes-xts.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
@@ -98,7 +98,7 @@ static int ccp_aes_xts_setkey(struct crypto_skcipher *tfm, const u8 *key,
        ctx->u.aes.key_len = key_len / 2;
        sg_init_one(&ctx->u.aes.key_sg, ctx->u.aes.key, key_len);
 
-       return crypto_sync_skcipher_setkey(ctx->u.aes.tfm_skcipher, key, key_len);
+       return crypto_skcipher_setkey(ctx->u.aes.tfm_skcipher, key, key_len);
 }
 
 static int ccp_aes_xts_crypt(struct skcipher_request *req,
@@ -145,20 +145,19 @@ static int ccp_aes_xts_crypt(struct skcipher_request *req,
            (ctx->u.aes.key_len != AES_KEYSIZE_256))
                fallback = 1;
        if (fallback) {
-               SYNC_SKCIPHER_REQUEST_ON_STACK(subreq,
-                                              ctx->u.aes.tfm_skcipher);
-
                /* Use the fallback to process the request for any
                 * unsupported unit sizes or key sizes
                 */
-               skcipher_request_set_sync_tfm(subreq, ctx->u.aes.tfm_skcipher);
-               skcipher_request_set_callback(subreq, req->base.flags,
-                                             NULL, NULL);
-               skcipher_request_set_crypt(subreq, req->src, req->dst,
-                                          req->cryptlen, req->iv);
-               ret = encrypt ? crypto_skcipher_encrypt(subreq) :
-                               crypto_skcipher_decrypt(subreq);
-               skcipher_request_zero(subreq);
+               skcipher_request_set_tfm(&rctx->fallback_req,
+                                        ctx->u.aes.tfm_skcipher);
+               skcipher_request_set_callback(&rctx->fallback_req,
+                                             req->base.flags,
+                                             req->base.complete,
+                                             req->base.data);
+               skcipher_request_set_crypt(&rctx->fallback_req, req->src,
+                                          req->dst, req->cryptlen, req->iv);
+               ret = encrypt ? crypto_skcipher_encrypt(&rctx->fallback_req) :
+                               crypto_skcipher_decrypt(&rctx->fallback_req);
                return ret;
        }
 
@@ -198,13 +197,12 @@ static int ccp_aes_xts_decrypt(struct skcipher_request *req)
 static int ccp_aes_xts_init_tfm(struct crypto_skcipher *tfm)
 {
        struct ccp_ctx *ctx = crypto_skcipher_ctx(tfm);
-       struct crypto_sync_skcipher *fallback_tfm;
+       struct crypto_skcipher *fallback_tfm;
 
        ctx->complete = ccp_aes_xts_complete;
        ctx->u.aes.key_len = 0;
 
-       fallback_tfm = crypto_alloc_sync_skcipher("xts(aes)", 0,
-                                            CRYPTO_ALG_ASYNC |
+       fallback_tfm = crypto_alloc_skcipher("xts(aes)", 0,
                                             CRYPTO_ALG_NEED_FALLBACK);
        if (IS_ERR(fallback_tfm)) {
                pr_warn("could not load fallback driver xts(aes)\n");
@@ -212,7 +210,8 @@ static int ccp_aes_xts_init_tfm(struct crypto_skcipher *tfm)
        }
        ctx->u.aes.tfm_skcipher = fallback_tfm;
 
-       crypto_skcipher_set_reqsize(tfm, sizeof(struct ccp_aes_req_ctx));
+       crypto_skcipher_set_reqsize(tfm, sizeof(struct ccp_aes_req_ctx) +
+                                        crypto_skcipher_reqsize(fallback_tfm));
 
        return 0;
 }
@@ -221,7 +220,7 @@ static void ccp_aes_xts_exit_tfm(struct crypto_skcipher *tfm)
 {
        struct ccp_ctx *ctx = crypto_skcipher_ctx(tfm);
 
-       crypto_free_sync_skcipher(ctx->u.aes.tfm_skcipher);
+       crypto_free_skcipher(ctx->u.aes.tfm_skcipher);
 }
 
 static int ccp_register_aes_xts_alg(struct list_head *head,

diff --git a/drivers/crypto/ccp/ccp-crypto.h b/drivers/crypto/ccp/ccp-crypto.h
index 90a009e6b5c138763bd0af3601319e2c7939e4cd..aed3d2192d013ca397236c901286991f2f455375 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto.h
+++ b/drivers/crypto/ccp/ccp-crypto.h
@@ -89,7 +89,7 @@ static inline struct ccp_crypto_ahash_alg *
 /***** AES related defines *****/
 struct ccp_aes_ctx {
        /* Fallback cipher for XTS with unsupported unit sizes */
-       struct crypto_sync_skcipher *tfm_skcipher;
+       struct crypto_skcipher *tfm_skcipher;
 
        enum ccp_engine engine;
        enum ccp_aes_type type;
@@ -121,6 +121,8 @@ struct ccp_aes_req_ctx {
        u8 rfc3686_iv[AES_BLOCK_SIZE];
 
        struct ccp_cmd cmd;
+
+       struct skcipher_request fallback_req;   // keep at the end
 };
 
 struct ccp_aes_cmac_req_ctx {