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 a memory leak in crypt_keyslot_add_by_key.

Browse Source 
Found by clang address sanitizer.

Also rename the variable - i's no longer a bare pointer,
the vk also owns the memory [okozina].
This commit is contained in:
Milan Broz
2022-11-04 20:25:48 +01:00
parent cb53c643c2
commit 871000fa05
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/setup.c
View File

@@ -5982,24 +5982,24 @@ static int verify_and_update_segment_digest(struct crypt_device *cd,
struct luks2_hdr *hdr, int keyslot, struct crypt_keyslot_context *kc) struct luks2_hdr *hdr, int keyslot, struct crypt_keyslot_context *kc)
{ {
int digest, r; int digest, r;
struct volume_key *p_vk = NULL; struct volume_key *vk = NULL;
assert(kc); assert(kc);
assert(kc->get_luks2_key); assert(kc->get_luks2_key);
assert(keyslot >= 0); assert(keyslot >= 0);
r = kc->get_luks2_key(cd, kc, keyslot, CRYPT_ANY_SEGMENT, &p_vk); r = kc->get_luks2_key(cd, kc, keyslot, CRYPT_ANY_SEGMENT, &vk);
if (r < 0) if (r < 0)
return r; return r;
/* check volume_key (param) digest matches keyslot digest */ /* check volume_key (param) digest matches keyslot digest */
r = LUKS2_digest_verify(cd, hdr, p_vk, keyslot); r = LUKS2_digest_verify(cd, hdr, vk, keyslot);
if (r < 0) if (r < 0)
goto out; goto out;
digest = r; digest = r;
/* nothing to do, volume key in keyslot is already assigned to default segment */ /* nothing to do, volume key in keyslot is already assigned to default segment */
r = LUKS2_digest_verify_by_segment(cd, hdr, CRYPT_DEFAULT_SEGMENT, p_vk); r = LUKS2_digest_verify_by_segment(cd, hdr, CRYPT_DEFAULT_SEGMENT, vk);
if (r >= 0) if (r >= 0)
goto out; goto out;
@@ -6009,6 +6009,8 @@ static int verify_and_update_segment_digest(struct crypt_device *cd,
if (r) if (r)
log_err(cd, _("Failed to assign keyslot %u as the new volume key."), keyslot); log_err(cd, _("Failed to assign keyslot %u as the new volume key."), keyslot);
out: out:
crypt_free_volume_key(vk);
return r < 0 ? r : keyslot; return r < 0 ? r : keyslot;
} }