diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-06 21:42:07 +1100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2006-03-21 20:14:08 +1100 |
| commit | bbeb563f7bb5e703e4d60c18bed81c987781343f (patch) | |
| tree | 681d7b0b923e71e7ad38c7b41a6de2b72cce3f21 /crypto | |
| parent | f10b7897ee29649fa7f0ccdc8d859ccd6ce7dbfd (diff) | |
| download | linux-3.10-bbeb563f7bb5e703e4d60c18bed81c987781343f.tar.gz linux-3.10-bbeb563f7bb5e703e4d60c18bed81c987781343f.tar.bz2 linux-3.10-bbeb563f7bb5e703e4d60c18bed81c987781343f.zip | |
[CRYPTO] all: Use kzalloc where possible
this patch converts crypto/ to kzalloc usage.
Compile tested with allyesconfig.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/api.c | 4 | ||||
| -rw-r--r-- | crypto/deflate.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/crypto/api.c b/crypto/api.c index 34e02caffc2..80bba637fba 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -179,12 +179,10 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags) goto out; tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags); - tfm = kmalloc(tfm_size, GFP_KERNEL); + tfm = kzalloc(tfm_size, GFP_KERNEL); if (tfm == NULL) goto out_put; - memset(tfm, 0, tfm_size); - tfm->__crt_alg = alg; if (crypto_init_flags(tfm, flags)) diff --git a/crypto/deflate.c b/crypto/deflate.c index bc73342cd1e..f209368d62a 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; |