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

Do not dereference the context pointer before assert.

Browse Source
This commit is contained in:
Ondrej Kozina
2024-11-04 11:23:57 +01:00
parent c0449fc24e
commit f5b7a576b3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/setup.c
View File

@@ -5524,7 +5524,6 @@ static int _verify_key(struct crypt_device *cd,
{
int r = -EINVAL;
crypt_reencrypt_info ri;
struct luks2_hdr *hdr = &cd->u.luks2.hdr;
assert(cd);
@@ -5538,13 +5537,13 @@ static int _verify_key(struct crypt_device *cd,
if (r == -EPERM)
log_err(cd, _("Volume key does not match the volume."));
} else if (isLUKS2(cd->type)) {
ri = LUKS2_reencrypt_status(hdr);
ri = LUKS2_reencrypt_status(&cd->u.luks2.hdr);
if (ri == CRYPT_REENCRYPT_INVALID)
return -EINVAL;
if (ri > CRYPT_REENCRYPT_NONE) {
LUKS2_reencrypt_lookup_key_ids(cd, hdr, vk);
r = LUKS2_reencrypt_digest_verify(cd, hdr, vk);
LUKS2_reencrypt_lookup_key_ids(cd, &cd->u.luks2.hdr, vk);
r = LUKS2_reencrypt_digest_verify(cd, &cd->u.luks2.hdr, vk);
if (r == -EPERM || r == -ENOENT || r == -EINVAL)
log_err(cd, _("Reencryption volume keys do not match the volume."));
return r;