summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-11-27 16:30:39 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2010-11-27 16:30:39 +0800
commitc8484594aeafe889269bd01232049b184140de3f (patch)
treec46365ca7ede307da79f486ba2b49e66a8a861d4 /crypto
parent8ff590903d5fc7f5a0a988c38267a3d08e6393a2 (diff)
downloadlinux-3.10-c8484594aeafe889269bd01232049b184140de3f.tar.gz
linux-3.10-c8484594aeafe889269bd01232049b184140de3f.tar.bz2
linux-3.10-c8484594aeafe889269bd01232049b184140de3f.zip
crypto: Use vzalloc
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/deflate.c3
-rw-r--r--crypto/zlib.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/crypto/deflate.c b/crypto/deflate.c
index 463dc859aa0..cbc7a33a960 100644
--- a/crypto/deflate.c
+++ b/crypto/deflate.c
@@ -48,12 +48,11 @@ static int deflate_comp_init(struct deflate_ctx *ctx)
int ret = 0;
struct z_stream_s *stream = &ctx->comp_stream;
- stream->workspace = vmalloc(zlib_deflate_workspacesize());
+ stream->workspace = vzalloc(zlib_deflate_workspacesize());
if (!stream->workspace) {
ret = -ENOMEM;
goto out;
}
- memset(stream->workspace, 0, zlib_deflate_workspacesize());
ret = zlib_deflateInit2(stream, DEFLATE_DEF_LEVEL, Z_DEFLATED,
-DEFLATE_DEF_WINBITS, DEFLATE_DEF_MEMLEVEL,
Z_DEFAULT_STRATEGY);
diff --git a/crypto/zlib.c b/crypto/zlib.c
index c3015733c99..739b8fca4ce 100644
--- a/crypto/zlib.c
+++ b/crypto/zlib.c
@@ -95,11 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
zlib_comp_exit(ctx);
workspacesize = zlib_deflate_workspacesize();
- stream->workspace = vmalloc(workspacesize);
+ stream->workspace = vzalloc(workspacesize);
if (!stream->workspace)
return -ENOMEM;
- memset(stream->workspace, 0, workspacesize);
ret = zlib_deflateInit2(stream,
tb[ZLIB_COMP_LEVEL]
? nla_get_u32(tb[ZLIB_COMP_LEVEL])