diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-02-17 08:24:54 +0900 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-02-17 09:46:25 +0100 |
| commit | 8c2264abb9c16bc2933f95be299f15ee66c21181 (patch) | |
| tree | 95801ee40b7ea57e2fe13f9ba8b67fcba9569d41 /src/cryptsetup | |
| parent | 79c8e46d235cec6e4f22c45912d5861a7b7ec942 (diff) | |
| download | systemd-8c2264abb9c16bc2933f95be299f15ee66c21181.tar.gz | |
cryptsetup: check the existence of salt by salt_size > 0
Follow-up for 504d0acf61c8472bc93c2a927e858074873b2eaf.
The function may be called with non-NULL salt and salt_size == 0.
Diffstat (limited to 'src/cryptsetup')
| -rw-r--r-- | src/cryptsetup/cryptsetup-tokens/luks2-tpm2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptsetup/cryptsetup-tokens/luks2-tpm2.c b/src/cryptsetup/cryptsetup-tokens/luks2-tpm2.c index c4377230ca..3074887269 100644 --- a/src/cryptsetup/cryptsetup-tokens/luks2-tpm2.c +++ b/src/cryptsetup/cryptsetup-tokens/luks2-tpm2.c @@ -56,7 +56,7 @@ int acquire_luks2_key( return -ENOANO; /* If we're using a PIN, and the luks header has a salt, it better have a pin too */ - if ((flags & TPM2_FLAGS_USE_PIN) && salt && !pin) + if ((flags & TPM2_FLAGS_USE_PIN) && salt_size > 0 && !pin) return -ENOANO; if (pin && salt_size > 0) { |