Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] aes: Fixed array boundary violation
  [CRYPTO] tcrypt: Fix key alignment
  [CRYPTO] all: Add missing cra_alignmask
  [CRYPTO] all: Use kzalloc where possible
  [CRYPTO] api: Align tfm context as wide as possible
  [CRYPTO] twofish: Use rol32/ror32 where appropriate

1 files changed, 1 insertions, 2 deletions

diff --git a/crypto/deflate.c b/crypto/deflate.c
index bc73342cd1ec..f209368d62ae 100644
--- a/crypto/deflate.c
+++ b/crypto/deflate.c
@@ -73,12 +73,11 @@ static int deflate_decomp_init(struct deflate_ctx *ctx)
         int ret = 0;
         struct z_stream_s *stream = &ctx->decomp_stream;
 
-        stream->workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
+        stream->workspace = kzalloc(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;