From d20929194f9ffaaedf11cce7f3756c53ca750b4c Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 29 Jan 2021 13:34:27 +0100 Subject: [PATCH] Fix previous commit error condition. This hints actually failed even if return code was OK. --- lib/integrity/integrity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/integrity/integrity.c b/lib/integrity/integrity.c index 15005058..d9f3d6e7 100644 --- a/lib/integrity/integrity.c +++ b/lib/integrity/integrity.c @@ -281,9 +281,9 @@ int INTEGRITY_activate_dmd_device(struct crypt_device *cd, if (r < 0 && (dmd->flags & CRYPT_ACTIVATE_RECALCULATE) && !(crypt_get_compatibility(cd) & CRYPT_COMPAT_LEGACY_INTEGRITY_RECALC) && - (sb_flags & SB_FLAG_FIXED_HMAC) ? + ((sb_flags & SB_FLAG_FIXED_HMAC) ? (tgt->u.integrity.vk && !tgt->u.integrity.journal_integrity_key) : - (tgt->u.integrity.vk || tgt->u.integrity.journal_integrity_key)) { + (tgt->u.integrity.vk || tgt->u.integrity.journal_integrity_key))) { log_err(cd, _("Kernel refuses to activate insecure recalculate option (see legacy activation options to override).")); return -ENOTSUP; }