crypto: ghash-clmulni - Fix load failure

ghash_clmulni_intel fails to load on Linux 4.3+ with the following message:
"modprobe: ERROR: could not insert 'ghash_clmulni_intel': Invalid argument"

After 8996eafdc ("crypto: ahash - ensure statesize is non-zero") all ahash
drivers are required to implement import()/export(), and must have a non-
zero statesize.

This patch has been tested with the algif_hash interface. The calculated
digest values, after several rounds of import()s and export()s, match those
calculated by tcrypt.

Signed-off-by: Rui Wang <rui.y.wang@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c
index 440df0c7a2eef7828b31a3c97db4fa110340d339..a69321a7778393f059fc43c4ead83ab1e0cd8d4e 100644 (file)
--- a/arch/x86/crypto/ghash-clmulni-intel_glue.c
+++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c
@@ -219,6 +219,29 @@ static int ghash_async_final(struct ahash_request *req)
        }
 }
 
+static int ghash_async_import(struct ahash_request *req, const void *in)
+{
+       struct ahash_request *cryptd_req = ahash_request_ctx(req);
+       struct shash_desc *desc = cryptd_shash_desc(cryptd_req);
+       struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+
+       ghash_async_init(req);
+       memcpy(dctx, in, sizeof(*dctx));
+       return 0;
+
+}
+
+static int ghash_async_export(struct ahash_request *req, void *out)
+{
+       struct ahash_request *cryptd_req = ahash_request_ctx(req);
+       struct shash_desc *desc = cryptd_shash_desc(cryptd_req);
+       struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+
+       memcpy(out, dctx, sizeof(*dctx));
+       return 0;
+
+}
+
 static int ghash_async_digest(struct ahash_request *req)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
@@ -288,8 +311,11 @@ static struct ahash_alg ghash_async_alg = {
        .final          = ghash_async_final,
        .setkey         = ghash_async_setkey,
        .digest         = ghash_async_digest,
+       .export         = ghash_async_export,
+       .import         = ghash_async_import,
        .halg = {
                .digestsize     = GHASH_DIGEST_SIZE,
+               .statesize = sizeof(struct ghash_desc_ctx),
                .base = {
                        .cra_name               = "ghash",
                        .cra_driver_name        = "ghash-clmulni",