From: Johannes Weiner <hannes@xxxxxxxxxxx> Use kzfree() instead of memset() + kfree(). Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx> Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> Cc: Alasdair Kergon <dm-devel@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/md/dm-crypt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/md/dm-crypt.c~md-use-kzfree drivers/md/dm-crypt.c --- a/drivers/md/dm-crypt.c~md-use-kzfree +++ a/drivers/md/dm-crypt.c @@ -1137,8 +1137,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; } @@ -1164,8 +1163,7 @@ static void crypt_dtr(struct dm_target * 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, _ -- dm-devel mailing list dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel
