Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d3520a3 authored by Stefan Rompf's avatar Stefan Rompf Committed by Linus Torvalds
Browse files

[PATCH] dm-crypt: zero key before freeing it 



Zap the memory before freeing it so we don't leave crypto information
around in memory.

Signed-off-by: default avatarStefan Rompf <stefan@loplof.de>
Acked-by: default avatarClemens Fruhwirth <clemens@endorphin.org>
Acked-by: default avatarAlasdair G Kergon <agk@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0b56306e

drivers/md/dm-crypt.c

+5 −0
Original line number Diff line number Diff line
@@ -690,6 +690,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
bad2:

	crypto_free_tfm(tfm);

bad1:

	/* Must zero key material before freeing */

	memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8));

	kfree(cc);

	return -EINVAL;

}
@@ -706,6 +708,9 @@ static void crypt_dtr(struct dm_target *ti) 
		cc->iv_gen_ops->dtr(cc);

	crypto_free_tfm(cc->tfm);

	dm_put_device(ti, cc->dev);



	/* Must zero key material before freeing */

	memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8));

	kfree(cc);

}