From: Johannes Weiner Date: Thu, 2 Apr 2009 18:55:28 +0000 (+0100) Subject: dm crypt: use kzfree X-Git-Tag: upstream/snapshot3+hdmi~19493^2~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b81d6cf79b57f6123a5d4f7a4932cc359995484d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git dm crypt: use kzfree Use kzfree() instead of memset() + kfree(). Signed-off-by: Johannes Weiner Reviewed-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Alasdair G Kergon --- diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index bfefd07..53394e8 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1156,8 +1156,7 @@ bad_ivmode: crypto_free_ablkcipher(tfm); bad_cipher: /* Must zero key material before freeing */ - memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8)); - kfree(cc); + kzfree(cc); return -EINVAL; } @@ -1183,8 +1182,7 @@ static void crypt_dtr(struct dm_target *ti) dm_put_device(ti, cc->dev); /* Must zero key material before freeing */ - memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8)); - kfree(cc); + kzfree(cc); } static int crypt_map(struct dm_target *ti, struct bio *bio,