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

Fix leak of volume key in activation code error path.

Browse Source
This commit is contained in:
Milan Broz
2023-07-17 15:31:49 +02:00
parent 928061f1f0
commit 7754660409
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/setup.c
View File

@@ -4586,7 +4586,7 @@ static int _open_and_activate(struct crypt_device *cd,
{ {
bool use_keyring; bool use_keyring;
int r; int r;
struct volume_key *p_crypt, *p_opal, *crypt_key = NULL, *opal_key = NULL, *vk = NULL; struct volume_key *p_crypt = NULL, *p_opal = NULL, *crypt_key = NULL, *opal_key = NULL, *vk = NULL;
r = LUKS2_keyslot_open(cd, keyslot, r = LUKS2_keyslot_open(cd, keyslot,
(flags & CRYPT_ACTIVATE_ALLOW_UNBOUND_KEY) ? (flags & CRYPT_ACTIVATE_ALLOW_UNBOUND_KEY) ?
@@ -4601,7 +4601,7 @@ static int _open_and_activate(struct crypt_device *cd,
vk, &crypt_key, vk, &crypt_key,
&opal_key); &opal_key);
if (r < 0) if (r < 0)
return r; goto out;
p_crypt = crypt_key; p_crypt = crypt_key;
p_opal = opal_key ?: vk; p_opal = opal_key ?: vk;