Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1k1Tkd-0007gW-9v for mharc-grub-devel@gnu.org; Fri, 31 Jul 2020 08:03:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1Tka-0007Yx-Gz for grub-devel@gnu.org; Fri, 31 Jul 2020 08:03:00 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:44829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1TkY-0005Yp-OG for grub-devel@gnu.org; Fri, 31 Jul 2020 08:03:00 -0400 Received: by mail-pl1-x644.google.com with SMTP id w17so17175965ply.11 for ; Fri, 31 Jul 2020 05:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=REXpaJs/oF2eBBSRBGaTx+V0gCP8ldHfySl2muxyjug=; b=tff4rUZCpiqt6NKeNKPt0WjtrFsaD44USs/XlrPU32Dg0jlT5boLBGvSAjsvB9P+GV BhHCy86iepblb2M0md+m/jXKWKhal706KVzntIWWBipmyx5KiQv1SSklTbiFUoMUkjNo XBKmXNCyTAOnMvXafoWEARqO8EgiCuodMmd+Gru4gZJRR/CUt3Piq45dywH+urFTD9U2 OxHXmdlGpiFsos0wrWo5KWS57xlScsIFuVfFKpk2P/6gJanHb1LFvZieYeU17h2bEPG9 sPBbL78+LmsyPPbkpn22goXbnrP89KyaAEczuax9RTvPdWvixX67GMuG3shfmuwaRG64 PaNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=REXpaJs/oF2eBBSRBGaTx+V0gCP8ldHfySl2muxyjug=; b=TnCqH0+ol7yFPmTn6mvabg1QPWXT7YLvPqLM6B3ZLI/4MxFglvoWGjlOHoWVQxhV10 UZUUPrcv9o85cxIzsko/wmjNcmxOQLFEa/YWwvMt821ZGrysv1xVpf1I/XZj0mfJVhMF HJ36ilXeK+903NIyT4QjhzHU2P1pZ1kPvc/WsavZ3xUtne4CrXBMfXZYXH6kexQbWjHQ fkwyp8sqDc3hPsapxS1j/SyAWnr87WWUu7plWkD9FF7CeY5xGEsVuWqRpPyEjsUfvW3u aR2iB5g5J9L9TjgufZXRbvEUzlm8HKEX5IU897ULp6/O0vcpDUHMgCEu1PkPHfmxJodw 0QHQ== X-Gm-Message-State: AOAM5335f3oYmWh1Uokbp7z1W/FehATbht4NI0maiBbjQDZzqgqZj24k jdRRYlE5ErNXv9qVR48EHonVoRl2jXo= X-Google-Smtp-Source: ABdhPJziM4EMyQB0e970M/0J158Yxpg0P42tb2ugvwc58xzKfErrbVYjHYqAULLbf7c0cV6JzgrGSg== X-Received: by 2002:a17:902:b60d:: with SMTP id b13mr3295639pls.48.1596196977156; Fri, 31 Jul 2020 05:02:57 -0700 (PDT) Received: from localhost.localdomain ([189.216.105.24]) by smtp.gmail.com with ESMTPSA id o4sm9781590pfd.25.2020.07.31.05.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 05:02:56 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Glenn Washburn , Daniel Kiper , Patrick Steinhardt Subject: [CRYPTO-LUKS v1 18/19] luks2: Fix use of incorrect index and some error messages. Date: Fri, 31 Jul 2020 07:01:59 -0500 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::644; envelope-from=development@efficientek.com; helo=mail-pl1-x644.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jul 2020 12:03:00 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 58bb4b9ef..09584c84c 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -257,54 +257,55 @@ luks2_parse_digest (grub_luks2_digest_t *out, const grub_json_t *digest) static grub_err_t luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_segment_t *s, - const grub_json_t *root, grub_size_t i) + const grub_json_t *root, grub_size_t keyslot_idx) { grub_json_t keyslots, keyslot, digests, digest, segments, segment; - grub_size_t j, size; - grub_uint64_t idx; + grub_size_t i, size; + grub_uint64_t keyslot_key, digest_key, segment_key; /* Get nth keyslot */ if (grub_json_getvalue (&keyslots, root, "keyslots") || - grub_json_getchild (&keyslot, &keyslots, i) || - grub_json_getuint64 (&idx, &keyslot, NULL) || + grub_json_getchild (&keyslot, &keyslots, keyslot_idx) || + grub_json_getuint64 (&keyslot_key, &keyslot, NULL) || grub_json_getchild (&keyslot, &keyslot, 0) || luks2_parse_keyslot (k, &keyslot)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot %"PRIuGRUB_SIZE, i); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot index %"PRIuGRUB_SIZE, keyslot_idx); /* Get digest that matches the keyslot. */ if (grub_json_getvalue (&digests, root, "digests") || grub_json_getsize (&size, &digests)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get digests"); - for (j = 0; j < size; j++) + for (i = 0; i < size; i++) { if (grub_json_getchild (&digest, &digests, i) || + grub_json_getuint64 (&digest_key, &digest, NULL) || grub_json_getchild (&digest, &digest, 0) || luks2_parse_digest (d, &digest)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRIuGRUB_SIZE, i); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest index %"PRIuGRUB_SIZE, i); - if ((d->keyslots & (1 << idx))) + if ((d->keyslots & (1 << keyslot_key))) break; } - if (j == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot %"PRIuGRUB_SIZE); + if (i == size) + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot \"%"PRIuGRUB_UINT64_T"\"", keyslot_key); /* Get segment that matches the digest. */ if (grub_json_getvalue (&segments, root, "segments") || grub_json_getsize (&size, &segments)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get segments"); - for (j = 0; j < size; j++) + for (i = 0; i < size; i++) { if (grub_json_getchild (&segment, &segments, i) || - grub_json_getuint64 (&idx, &segment, NULL) || + grub_json_getuint64 (&segment_key, &segment, NULL) || grub_json_getchild (&segment, &segment, 0) || luks2_parse_segment (s, &segment)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PRIuGRUB_SIZE, i); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment index %"PRIuGRUB_SIZE, i); - if ((d->segments & (1 << idx))) + if ((d->segments & (1 << segment_key))) break; } - if (j == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %"PRIuGRUB_SIZE); + if (i == size) + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest \"%"PRIuGRUB_UINT64_T"\"", digest_key); return GRUB_ERR_NONE; } -- 2.25.1