Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1k0tzi-0003Ci-3v for mharc-grub-devel@gnu.org; Wed, 29 Jul 2020 17:52:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0tze-00032a-Ia for grub-devel@gnu.org; Wed, 29 Jul 2020 17:52:10 -0400 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:37782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0tzc-0006M7-97 for grub-devel@gnu.org; Wed, 29 Jul 2020 17:52:10 -0400 Received: by mail-qt1-x841.google.com with SMTP id d27so18855890qtg.4 for ; Wed, 29 Jul 2020 14:52:07 -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=jMgj6IKK2LNMvkcg6ZrqYwmCpZ/Pvv3G8+S6ppUF7kA=; b=HZ+TyyYGi6y9wH53589Xhzu0J48DzuDaRQzjXE7BnFtlSTjYWLwO7+uMIW8Z9QTG7q RMf2XweNeNba6m3NR2+tTVA1Uw16ewQ5Uco9QsvU/U5dzBwM11QmGuBx5wVLcXIfiCwy rEJmsWuabfsSXZd3WmfHUclzWSlsRe/rPI9jaoiGmp2O2mjeyc6r7q4n1a/BtlcL6vlf xN2sMyVnJgXTJqzQKqtnV1jbx2bXK17rq58Jh/p6bqblwo+7GOxnpQ3J5lDC+QVF33vu 5ydPL3P4w4sF3Oafi1GywTtMqpqBh2b0NOx0be2hBH0Fo25W+IqIQMdYOuxEK7D34ZCz jvpA== 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=jMgj6IKK2LNMvkcg6ZrqYwmCpZ/Pvv3G8+S6ppUF7kA=; b=afKrNJGtapiTIw74yE8b/t3J03twrnDwfIdKmNRscBXm55xNZCFEtqZ3SH9CKWF9wU 97Om3kTfjJhuQwq5oUdVqxwZ0Le2lJtwlh47EtceCQb4feYxy2VOfnZaYP3g0FAgog2u pEmuopal69U/UFZ3tbnXuvLJw502fjF7yh/DEESBEQAfV1VH7sVeKK2rlWSca5mcqpI1 kNpC46/cQMXTfkJTcXW4vh+8b3n8x7G42JNiwLDV68i+Vw16SRDyl+fazXtfefl2DN1u M7nFjKT2fJWNHio1CBedBXSPCjmmBCZnhVLgc/kkm4Ko0YS03dp9WHVaQjuQzXvlP6yt 5bHQ== X-Gm-Message-State: AOAM531U/3JLLIt+uJPk6teErkfGenptON/FBA2YB+T/Q1Vgm6HaXB0A CeD5wxIdJRJVKFLc9tAcxzKWGm4gAHs= X-Google-Smtp-Source: ABdhPJxb4sCwHFWHExDhcKM17ynJ4LrnpBoX07rmb6qdZVi50cj2XgDKzVjVaRGE4vqMjDOMOv2HAg== X-Received: by 2002:ac8:5146:: with SMTP id h6mr27832qtn.290.1596059527170; Wed, 29 Jul 2020 14:52:07 -0700 (PDT) Received: from localhost.localdomain ([189.216.105.24]) by smtp.gmail.com with ESMTPSA id n127sm2804165qke.29.2020.07.29.14.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 14:52:06 -0700 (PDT) From: development@efficientek.com To: grub-devel@gnu.org Cc: Glenn Washburn , Daniel Kiper , Patrick Steinhardt Subject: [PATCH 17/17] luks2: Fix use of incorrect index and some error messages. Date: Wed, 29 Jul 2020 16:50:22 -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::841; envelope-from=development@efficientek.com; helo=mail-qt1-x841.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: Wed, 29 Jul 2020 21:52:10 -0000 From: Glenn Washburn Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 44a73d2b8..48600db68 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -277,34 +277,34 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get digests"); for (j = 0; j < size; j++) { - if (grub_json_getchild (&digest, &digests, i) || + if (grub_json_getchild (&digest, &digests, j) || 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 %"PRIuGRUB_SIZE, j); if ((d->keyslots & (1 << idx))) break; } if (j == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot %"PRIuGRUB_SIZE); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot %"PRIuGRUB_SIZE, i); /* 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 = j, j = 0; j < size; j++) { - if (grub_json_getchild (&segment, &segments, i) || + if (grub_json_getchild (&segment, &segments, j) || grub_json_getuint64 (&idx, &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 %"PRIuGRUB_SIZE, j); if ((d->segments & (1 << idx))) break; } if (j == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %"PRIuGRUB_SIZE); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %"PRIuGRUB_SIZE, i); return GRUB_ERR_NONE; } -- 2.25.1