linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / crypto / deflate.c

diff --git a/crypto/deflate.c b/crypto/deflate.c
index f209368..bc73342 100644 (file)
--- a/crypto/deflate.c
+++ b/crypto/deflate.c
@@ -73,11 +73,12 @@ static int deflate_decomp_init(struct deflate_ctx *ctx)
        int ret = 0;
        struct z_stream_s *stream = &ctx->decomp_stream;
 
-       stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
+       stream->workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
        if (!stream->workspace ) {
                ret = -ENOMEM;
                goto out;
        }
+       memset(stream->workspace, 0, zlib_inflate_workspacesize());
        ret = zlib_inflateInit2(stream, -DEFLATE_DEF_WINBITS);
        if (ret != Z_OK) {
                ret = -EINVAL;