mirror of
https://github.com/systemd/systemd.git
synced 2024-10-31 16:21:26 +03:00
cryptsetup: Fix misplaced assert.
Seems the assert should be placed in-before decrypted_key pointer is passed to libcryptsetup API. Original placement would trigger abort in case tpm2 hw was not present in the system while required to activate crypt devices.
This commit is contained in:
parent
b6fce22a67
commit
26fbc5aa05
@ -1140,7 +1140,6 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2(
|
||||
if (r != -EAGAIN) /* EAGAIN means: no tpm2 chip found */
|
||||
return r;
|
||||
}
|
||||
assert(decrypted_key);
|
||||
|
||||
if (!monitor) {
|
||||
/* We didn't find the TPM2 device. In this case, watch for it via udev. Let's create
|
||||
@ -1181,6 +1180,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2(
|
||||
|
||||
log_debug("Got one or more potentially relevant udev events, rescanning for TPM2...");
|
||||
}
|
||||
assert(decrypted_key);
|
||||
|
||||
if (pass_volume_key)
|
||||
r = crypt_activate_by_volume_key(cd, name, decrypted_key, decrypted_key_size, flags);
|
||||
|
Loading…
Reference in New Issue
Block a user