crypto: cavium - Fix fallout from CONFIG_VMAP_STACK

commit 37ff02acaa3d7be87ecb89f198a549ffd3ae2403 upstream.

Enabling virtual mapped kernel stacks breaks the thunderx_zip
driver. On compression or decompression the executing CPU hangs
in an endless loop. The reason for this is the usage of __pa
by the driver which does no longer work for an address that is
not part of the 1:1 mapping.

The zip driver allocates a result struct on the stack and needs
to tell the hardware the physical address within this struct
that is used to signal the completion of the request.

As the hardware gets the wrong address after the broken __pa
conversion it writes to an arbitrary address. The zip driver then
waits forever for the completion byte to contain a non-zero value.

Allocating the result struct from 1:1 mapped memory resolves this
bug.

Signed-off-by: Jan Glauber <jglauber@cavium.com>
Reviewed-by: Robert Richter <rrichter@cavium.com>
Cc: stable <stable@vger.kernel.org> # 4.14
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/crypto/cavium/zip/zip_crypto.c b/drivers/crypto/cavium/zip/zip_crypto.c
index 8df4d26cf9d46894e68c86f2032fb3f9b4ca899d..b92b6e7e100f307e4481f35912511df5cf3cebe6 100644 (file)
--- a/drivers/crypto/cavium/zip/zip_crypto.c
+++ b/drivers/crypto/cavium/zip/zip_crypto.c
@@ -124,7 +124,7 @@ int zip_compress(const u8 *src, unsigned int slen,
                 struct zip_kernel_ctx *zip_ctx)
 {
        struct zip_operation  *zip_ops   = NULL;
-       struct zip_state      zip_state;
+       struct zip_state      *zip_state;
        struct zip_device     *zip = NULL;
        int ret;
 
@@ -135,20 +135,23 @@ int zip_compress(const u8 *src, unsigned int slen,
        if (!zip)
                return -ENODEV;
 
-       memset(&zip_state, 0, sizeof(struct zip_state));
+       zip_state = kzalloc(sizeof(*zip_state), GFP_ATOMIC);
+       if (!zip_state)
+               return -ENOMEM;
+
        zip_ops = &zip_ctx->zip_comp;
 
        zip_ops->input_len  = slen;
        zip_ops->output_len = *dlen;
        memcpy(zip_ops->input, src, slen);
 
-       ret = zip_deflate(zip_ops, &zip_state, zip);
+       ret = zip_deflate(zip_ops, zip_state, zip);
 
        if (!ret) {
                *dlen = zip_ops->output_len;
                memcpy(dst, zip_ops->output, *dlen);
        }
-
+       kfree(zip_state);
        return ret;
 }
 
@@ -157,7 +160,7 @@ int zip_decompress(const u8 *src, unsigned int slen,
                   struct zip_kernel_ctx *zip_ctx)
 {
        struct zip_operation  *zip_ops   = NULL;
-       struct zip_state      zip_state;
+       struct zip_state      *zip_state;
        struct zip_device     *zip = NULL;
        int ret;
 
@@ -168,7 +171,10 @@ int zip_decompress(const u8 *src, unsigned int slen,
        if (!zip)
                return -ENODEV;
 
-       memset(&zip_state, 0, sizeof(struct zip_state));
+       zip_state = kzalloc(sizeof(*zip_state), GFP_ATOMIC);
+       if (!zip_state)
+               return -ENOMEM;
+
        zip_ops = &zip_ctx->zip_decomp;
        memcpy(zip_ops->input, src, slen);
 
@@ -179,13 +185,13 @@ int zip_decompress(const u8 *src, unsigned int slen,
        zip_ops->input_len  = slen;
        zip_ops->output_len = *dlen;
 
-       ret = zip_inflate(zip_ops, &zip_state, zip);
+       ret = zip_inflate(zip_ops, zip_state, zip);
 
        if (!ret) {
                *dlen = zip_ops->output_len;
                memcpy(dst, zip_ops->output, *dlen);
        }
-
+       kfree(zip_state);
        return ret;
 }