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

fix memleaks on integrity format error path

Browse Source
This commit is contained in:
Ondrej Kozina
2017-11-16 13:29:56 +01:00
committed by Milan Broz
parent ad3fe00dea
commit 7d4fcfa191
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/setup.c
View File

@@ -1844,6 +1844,8 @@ static int _crypt_format_integrity(struct crypt_device *cd,
struct crypt_params_integrity *params) struct crypt_params_integrity *params)
{ {
int r; int r;
char *integrity = NULL, *journal_integrity = NULL, *journal_crypt = NULL;
struct volume_key *journal_crypt_key = NULL, *journal_mac_key = NULL;
if (!params) if (!params)
return -EINVAL; return -EINVAL;
@@ -1870,24 +1872,36 @@ static int _crypt_format_integrity(struct crypt_device *cd,
return -ENOMEM; return -ENOMEM;
if (params->journal_crypt_key) { if (params->journal_crypt_key) {
cd->u.integrity.journal_crypt_key = journal_crypt_key = crypt_alloc_volume_key(params->journal_crypt_key_size,
crypt_alloc_volume_key(params->journal_crypt_key_size, params->journal_crypt_key);
params->journal_crypt_key); if (!journal_crypt_key)
if (!cd->u.integrity.journal_crypt_key) {
crypt_reset_null_type(cd);
return -ENOMEM; return -ENOMEM;
}
} }
if (params->journal_integrity_key) { if (params->journal_integrity_key) {
cd->u.integrity.journal_mac_key = journal_mac_key = crypt_alloc_volume_key(params->journal_integrity_key_size,
crypt_alloc_volume_key(params->journal_integrity_key_size, params->journal_integrity_key);
params->journal_integrity_key); if (!journal_mac_key) {
if (!cd->u.integrity.journal_mac_key) { r = -ENOMEM;
crypt_reset_null_type(cd); goto err;
return -ENOMEM;
} }
} }
if (params->integrity && !(integrity = strdup(params->integrity))) {
r = -ENOMEM;
goto err;
}
if (params->journal_integrity && !(journal_integrity = strdup(params->journal_integrity))) {
r = -ENOMEM;
goto err;
}
if (params->journal_crypt && !(journal_crypt = strdup(params->journal_crypt))) {
r = -ENOMEM;
goto err;
}
cd->u.integrity.journal_crypt_key = journal_crypt_key;
cd->u.integrity.journal_mac_key = journal_mac_key;
cd->u.integrity.params.journal_size = params->journal_size; cd->u.integrity.params.journal_size = params->journal_size;
cd->u.integrity.params.journal_watermark = params->journal_watermark; cd->u.integrity.params.journal_watermark = params->journal_watermark;
cd->u.integrity.params.journal_commit_time = params->journal_commit_time; cd->u.integrity.params.journal_commit_time = params->journal_commit_time;
@@ -1895,17 +1909,22 @@ static int _crypt_format_integrity(struct crypt_device *cd,
cd->u.integrity.params.buffer_sectors = params->buffer_sectors; cd->u.integrity.params.buffer_sectors = params->buffer_sectors;
cd->u.integrity.params.sector_size = params->sector_size; cd->u.integrity.params.sector_size = params->sector_size;
cd->u.integrity.params.tag_size = params->tag_size; cd->u.integrity.params.tag_size = params->tag_size;
if (params->integrity) cd->u.integrity.params.integrity = integrity;
cd->u.integrity.params.integrity = strdup(params->integrity); cd->u.integrity.params.journal_integrity = journal_integrity;
if (params->journal_integrity) cd->u.integrity.params.journal_crypt = journal_crypt;
cd->u.integrity.params.journal_integrity = strdup(params->journal_integrity);
if (params->journal_crypt)
cd->u.integrity.params.journal_crypt = strdup(params->journal_crypt);
r = INTEGRITY_format(cd, params, cd->u.integrity.journal_crypt_key, cd->u.integrity.journal_mac_key); r = INTEGRITY_format(cd, params, cd->u.integrity.journal_crypt_key, cd->u.integrity.journal_mac_key);
if (r) if (r)
log_err(cd, _("Cannot format integrity for device %s.\n"), log_err(cd, _("Cannot format integrity for device %s.\n"),
mdata_device_path(cd)); mdata_device_path(cd));
err:
if (r) {
crypt_free_volume_key(journal_crypt_key);
crypt_free_volume_key(journal_mac_key);
free(integrity);
free(journal_integrity);
free(journal_crypt);
}
return r; return r;
} }