From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Weiner Subject: [patch 4/7] md: use kzfree() Date: Tue, 17 Feb 2009 19:26:19 +0100 Message-ID: <20090217184135.997082882@cmpxchg.org> References: <20090217182615.897042724@cmpxchg.org> Return-path: Content-Disposition: inline; filename=md-use-kzfree.patch Sender: owner-linux-mm@kvack.org To: Andrew Morton Cc: Pekka Enberg , Chas Williams , Evgeniy Polyakov , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Alasdair Kergon List-Id: dm-devel.ids Use kzfree() instead of memset() + kfree(). Signed-off-by: Johannes Weiner Reviewed-by: Pekka Enberg Cc: Alasdair Kergon --- drivers/md/dm-crypt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/md/dm-crypt.c +++ b/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, -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753592AbZBQTpW (ORCPT ); Tue, 17 Feb 2009 14:45:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754735AbZBQToE (ORCPT ); Tue, 17 Feb 2009 14:44:04 -0500 Received: from cmpxchg.org ([85.214.51.133]:38484 "EHLO cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754727AbZBQToD (ORCPT ); Tue, 17 Feb 2009 14:44:03 -0500 Message-Id: <20090217184135.997082882@cmpxchg.org> User-Agent: quilt/0.47-1 Date: Tue, 17 Feb 2009 19:26:19 +0100 From: Johannes Weiner To: Andrew Morton Cc: Pekka Enberg , Chas Williams , Evgeniy Polyakov , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Alasdair Kergon Subject: [patch 4/7] md: use kzfree() References: <20090217182615.897042724@cmpxchg.org> Content-Disposition: inline; filename=md-use-kzfree.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use kzfree() instead of memset() + kfree(). Signed-off-by: Johannes Weiner Reviewed-by: Pekka Enberg Cc: Alasdair Kergon --- drivers/md/dm-crypt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/md/dm-crypt.c +++ b/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,