[PATCH RESEND 2/4] crypto: hisilicon/zip - fix zero length input in GZIP decompress

[Yang Shen]

From: Zhou Wang <wangzh...@hisilicon.com>

The zero length input will cause a call trace when use GZIP
decompress like this:
    Unable to handle kernel paging request at virtual address
    ...
    lr : get_gzip_head_size+0x7c/0xd0 [hisi_zip]

Judge the input length and return '-EINVAL' when input is invalid.

Fixes: 62c455ca853e("crypto: hisilicon - add HiSilicon ZIP...")
Signed-off-by: Zhou Wang <wangzh...@hisilicon.com>
Signed-off-by: Yang Shen <shenyan...@huawei.com>
---
 drivers/crypto/hisilicon/zip/zip_crypto.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c 
b/drivers/crypto/hisilicon/zip/zip_crypto.c
index 38f92d4..48dc2fd 100644
--- a/drivers/crypto/hisilicon/zip/zip_crypto.c
+++ b/drivers/crypto/hisilicon/zip/zip_crypto.c
@@ -454,7 +454,7 @@ static int add_comp_head(struct scatterlist *dst, u8 
req_type)
        return head_size;
 }
 
-static size_t get_gzip_head_size(struct scatterlist *sgl)
+static size_t __maybe_unused get_gzip_head_size(struct scatterlist *sgl)
 {
        char buf[HZIP_GZIP_HEAD_BUF];
 
@@ -463,13 +463,20 @@ static size_t get_gzip_head_size(struct scatterlist *sgl)
        return __get_gzip_head_size(buf);
 }
 
-static size_t get_comp_head_size(struct scatterlist *src, u8 req_type)
+static int  get_comp_head_size(struct acomp_req *acomp_req, u8 req_type)
 {
+       if (!acomp_req->src || !acomp_req->slen)
+               return -EINVAL;
+
+       if ((req_type == HZIP_ALG_TYPE_GZIP) &&
+           (acomp_req->slen < GZIP_HEAD_FEXTRA_SHIFT))
+               return -EINVAL;
+
        switch (req_type) {
        case HZIP_ALG_TYPE_ZLIB:
                return TO_HEAD_SIZE(HZIP_ALG_TYPE_ZLIB);
        case HZIP_ALG_TYPE_GZIP:
-               return get_gzip_head_size(src);
+               return TO_HEAD_SIZE(HZIP_ALG_TYPE_GZIP);
        default:
                pr_err("request type does not support!\n");
                return -EINVAL;
@@ -606,10 +613,14 @@ static int hisi_zip_adecompress(struct acomp_req 
*acomp_req)
        struct hisi_zip_qp_ctx *qp_ctx = &ctx->qp_ctx[HZIP_QPC_DECOMP];
        struct device *dev = &qp_ctx->qp->qm->pdev->dev;
        struct hisi_zip_req *req;
-       size_t head_size;
-       int ret;
+       int head_size, ret;
 
-       head_size = get_comp_head_size(acomp_req->src, qp_ctx->qp->req_type);
+       head_size = get_comp_head_size(acomp_req, qp_ctx->qp->req_type);
+       if (head_size < 0) {
+               dev_err_ratelimited(dev, "failed to get comp head size (%d)!\n",
+                                   head_size);
+               return head_size;
+       }
 
        req = hisi_zip_create_req(acomp_req, qp_ctx, head_size, false);
        if (IS_ERR(req))
-- 
2.7.4