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

Fix a memory leak of key description for integrity device.

Browse Source
This commit is contained in:
Milan Broz
2017-10-27 15:58:33 +02:00
parent fb5a70a663
commit 1f2ce01c08
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/setup.c
View File

@@ -2282,13 +2282,16 @@ static char *crypt_get_device_key_description(const char *name)
char *tmp = NULL; char *tmp = NULL;
struct crypt_dm_active_device dmd; struct crypt_dm_active_device dmd;
if (dm_query_device(NULL, name, DM_ACTIVE_CRYPT_KEY | DM_ACTIVE_CRYPT_KEYSIZE, &dmd) < 0 || dmd.target != DM_CRYPT) if (dm_query_device(NULL, name, DM_ACTIVE_CRYPT_KEY | DM_ACTIVE_CRYPT_KEYSIZE, &dmd) < 0)
return NULL; return NULL;
if (dmd.target == DM_CRYPT) {
if (dmd.flags & CRYPT_ACTIVATE_KEYRING_KEY) if (dmd.flags & CRYPT_ACTIVATE_KEYRING_KEY)
tmp = strdup(crypt_volume_key_get_description(dmd.u.crypt.vk)); tmp = strdup(crypt_volume_key_get_description(dmd.u.crypt.vk));
crypt_free_volume_key(dmd.u.crypt.vk); crypt_free_volume_key(dmd.u.crypt.vk);
} else if (dmd.target == DM_INTEGRITY) {
crypt_free_volume_key(dmd.u.integrity.vk);
}
return tmp; return tmp;
} }