---

yaml --- r: 22339 b: refs/heads/master c: bbeb563 h: refs/heads/master i: 22337: 1821c63 22335: 85a7b7a v: v3
git-mirror · Mar 21, 2006 · ad6f914 · ad6f914
1 parent e0c5022
commit ad6f914
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f10b7897ee29649fa7f0ccdc8d859ccd6ce7dbfd
+refs/heads/master: bbeb563f7bb5e703e4d60c18bed81c987781343f
diff --git a/trunk/crypto/api.c b/trunk/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/trunk/crypto/deflate.c b/trunk/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;