1 files changed, 11 insertions, 7 deletions

diff --git a/crypto/zlib.c b/crypto/zlib.c
index 739b8fca4cea..d11d761a5e41 100644
--- a/crypto/zlib.c
+++ b/crypto/zlib.c
@@ -85,6 +85,7 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
         struct zlib_ctx *ctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
         struct z_stream_s *stream = &ctx->comp_stream;
         struct nlattr *tb[ZLIB_COMP_MAX + 1];
+        int window_bits, mem_level;
         size_t workspacesize;
         int ret;
 
@@ -94,7 +95,14 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
 
         zlib_comp_exit(ctx);
 
-        workspacesize = zlib_deflate_workspacesize();
+        window_bits = tb[ZLIB_COMP_WINDOWBITS]
+                                        ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
+                                        : MAX_WBITS;
+        mem_level = tb[ZLIB_COMP_MEMLEVEL]
+                                        ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
+                                        : DEF_MEM_LEVEL;
+
+        workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
         stream->workspace = vzalloc(workspacesize);
         if (!stream->workspace)
                 return -ENOMEM;
@@ -106,12 +114,8 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
                                 tb[ZLIB_COMP_METHOD]
                                         ? nla_get_u32(tb[ZLIB_COMP_METHOD])
                                         : Z_DEFLATED,
-                                tb[ZLIB_COMP_WINDOWBITS]
-                                        ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
-                                        : MAX_WBITS,
-                                tb[ZLIB_COMP_MEMLEVEL]
-                                        ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
-                                        : DEF_MEM_LEVEL,
+                                window_bits,
+                                mem_level,
                                 tb[ZLIB_COMP_STRATEGY]
                                         ? nla_get_u32(tb[ZLIB_COMP_STRATEGY])
                                         : Z_DEFAULT_STRATEGY);