eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in verity device destructor.

Browse Source
This commit is contained in:
Milan Broz
2017-10-27 21:45:54 +02:00
parent 1f2ce01c08
commit a10059d531
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/setup.c
View File

@@ -1007,6 +1007,9 @@ static void crypt_free_type(struct crypt_device *cd)
free(cd->u.loopaes.cipher);
} else if (isVERITY(cd->type)) {
free(CONST_CAST(void*)cd->u.verity.hdr.hash_name);
free(CONST_CAST(void*)cd->u.verity.hdr.data_device);
free(CONST_CAST(void*)cd->u.verity.hdr.hash_device);
free(CONST_CAST(void*)cd->u.verity.hdr.fec_device);
free(CONST_CAST(void*)cd->u.verity.hdr.salt);
free(cd->u.verity.root_hash);
free(cd->u.verity.uuid);
@@ -1151,10 +1154,10 @@ static int _init_by_name_verity(struct crypt_device *cd, const char *name)
verity_type = 1;
}
out:
if (!verity_type && dmd.u.verity.vp) {
free(CONST_CAST(void*)dmd.u.verity.vp->hash_name);
free(CONST_CAST(void*)dmd.u.verity.vp->salt);
free(CONST_CAST(void*)dmd.u.verity.fec_device);
if (!verity_type) {
free(CONST_CAST(void*)params.hash_name);
free(CONST_CAST(void*)params.salt);
free(CONST_CAST(void*)params.fec_device);
}
device_free(dmd.data_device);
return r;