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

Fix string leak in BITLK attribute name handling.

Browse Source
This commit is contained in:
Milan Broz
2020-01-03 13:44:57 +01:00
parent 080566a1fd
commit 864bbc5472
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/bitlk/bitlk.c
View File

@@ -350,16 +350,19 @@ static int parse_vmk_entry(struct crypt_device *cd, uint8_t *data, int start, in
} else if (key_entry_value == BITLK_ENTRY_VALUE_STRING) {
if (convert_to_utf8(cd, data + start + BITLK_ENTRY_HEADER_LEN, key_entry_size - BITLK_ENTRY_HEADER_LEN, &string) < 0) {
log_err(cd, _("Invalid string found when parsing VMK."));
free(string);
return -EINVAL;
} else if ((*vmk)->name != NULL) {
if (supported) {
log_err(cd, _("Unexpected string ('%s') found when parsing supported VMK."), string);
free(string);
return -EINVAL;
} else {
log_dbg(cd, "Unexpected string ('%s') found when parsing unsupported VMK.", string);
}
log_dbg(cd, "Unexpected string ('%s') found when parsing unsupported VMK.", string);
free(string);
string = NULL;
} else {
// Assume that strings in VMK are the name of the VMK
/* Assume that strings in VMK are the name of the VMK */
(*vmk)->name = string;
string = NULL;
}