diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2009-04-02 14:55:28 -0400 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2009-04-02 14:55:28 -0400 |
commit | b81d6cf79b57f6123a5d4f7a4932cc359995484d (patch) | |
tree | ac3df19b3800c4ecb9e5725ada90c606d542dfbb /drivers/md/dm-crypt.c | |
parent | 45194e4f89fbdd97a2b7d2698c05f0b00c19e820 (diff) |
dm crypt: use kzfree
Use kzfree() instead of memset() + kfree().
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm-crypt.c')
-rw-r--r-- | drivers/md/dm-crypt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index bfefd079a955..53394e863c74 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -1156,8 +1156,7 @@ bad_ivmode: | |||
1156 | crypto_free_ablkcipher(tfm); | 1156 | crypto_free_ablkcipher(tfm); |
1157 | bad_cipher: | 1157 | bad_cipher: |
1158 | /* Must zero key material before freeing */ | 1158 | /* Must zero key material before freeing */ |
1159 | memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8)); | 1159 | kzfree(cc); |
1160 | kfree(cc); | ||
1161 | return -EINVAL; | 1160 | return -EINVAL; |
1162 | } | 1161 | } |
1163 | 1162 | ||
@@ -1183,8 +1182,7 @@ static void crypt_dtr(struct dm_target *ti) | |||
1183 | dm_put_device(ti, cc->dev); | 1182 | dm_put_device(ti, cc->dev); |
1184 | 1183 | ||
1185 | /* Must zero key material before freeing */ | 1184 | /* Must zero key material before freeing */ |
1186 | memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8)); | 1185 | kzfree(cc); |
1187 | kfree(cc); | ||
1188 | } | 1186 | } |
1189 | 1187 | ||
1190 | static int crypt_map(struct dm_target *ti, struct bio *bio, | 1188 | static int crypt_map(struct dm_target *ti, struct bio *bio, |