diff options
author | Joe Perches <joe@perches.com> | 2010-11-27 03:30:39 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-11-27 03:30:39 -0500 |
commit | c8484594aeafe889269bd01232049b184140de3f (patch) | |
tree | c46365ca7ede307da79f486ba2b49e66a8a861d4 | |
parent | 8ff590903d5fc7f5a0a988c38267a3d08e6393a2 (diff) |
crypto: Use vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | crypto/deflate.c | 3 | ||||
-rw-r--r-- | crypto/zlib.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crypto/deflate.c b/crypto/deflate.c index 463dc859aa05..cbc7a33a9600 100644 --- a/crypto/deflate.c +++ b/crypto/deflate.c | |||
@@ -48,12 +48,11 @@ static int deflate_comp_init(struct deflate_ctx *ctx) | |||
48 | int ret = 0; | 48 | int ret = 0; |
49 | struct z_stream_s *stream = &ctx->comp_stream; | 49 | struct z_stream_s *stream = &ctx->comp_stream; |
50 | 50 | ||
51 | stream->workspace = vmalloc(zlib_deflate_workspacesize()); | 51 | stream->workspace = vzalloc(zlib_deflate_workspacesize()); |
52 | if (!stream->workspace) { | 52 | if (!stream->workspace) { |
53 | ret = -ENOMEM; | 53 | ret = -ENOMEM; |
54 | goto out; | 54 | goto out; |
55 | } | 55 | } |
56 | memset(stream->workspace, 0, zlib_deflate_workspacesize()); | ||
57 | ret = zlib_deflateInit2(stream, DEFLATE_DEF_LEVEL, Z_DEFLATED, | 56 | ret = zlib_deflateInit2(stream, DEFLATE_DEF_LEVEL, Z_DEFLATED, |
58 | -DEFLATE_DEF_WINBITS, DEFLATE_DEF_MEMLEVEL, | 57 | -DEFLATE_DEF_WINBITS, DEFLATE_DEF_MEMLEVEL, |
59 | Z_DEFAULT_STRATEGY); | 58 | Z_DEFAULT_STRATEGY); |
diff --git a/crypto/zlib.c b/crypto/zlib.c index c3015733c990..739b8fca4cea 100644 --- a/crypto/zlib.c +++ b/crypto/zlib.c | |||
@@ -95,11 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params, | |||
95 | zlib_comp_exit(ctx); | 95 | zlib_comp_exit(ctx); |
96 | 96 | ||
97 | workspacesize = zlib_deflate_workspacesize(); | 97 | workspacesize = zlib_deflate_workspacesize(); |
98 | stream->workspace = vmalloc(workspacesize); | 98 | stream->workspace = vzalloc(workspacesize); |
99 | if (!stream->workspace) | 99 | if (!stream->workspace) |
100 | return -ENOMEM; | 100 | return -ENOMEM; |
101 | 101 | ||
102 | memset(stream->workspace, 0, workspacesize); | ||
103 | ret = zlib_deflateInit2(stream, | 102 | ret = zlib_deflateInit2(stream, |
104 | tb[ZLIB_COMP_LEVEL] | 103 | tb[ZLIB_COMP_LEVEL] |
105 | ? nla_get_u32(tb[ZLIB_COMP_LEVEL]) | 104 | ? nla_get_u32(tb[ZLIB_COMP_LEVEL]) |