From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kbG8k-00006O-20 for mharc-grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbG8h-0008Q7-3u for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:47 -0500 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:46814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbG8b-0002q8-BP for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:46 -0500 Received: by mail-ot1-x344.google.com with SMTP id g19so3306148otp.13 for ; Fri, 06 Nov 2020 20:47:39 -0800 (PST) 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=U39m63M7vqzd/S5CqZImRKJ1fwMwQvU05d/6n2kM4OY=; b=EOza73zxtUit79/3ahfo7A4jftAX8rKmzSUMGDSeoXU4lDGPQfQY0nuBCJ85Ha3GP4 W4ImeDVvL2Oc6FYPoVWixJFm3QfeSegeQC3lf+DoKIRCGctrIQCl8LphgsgKDyidVAn7 jvHmAqJoijziLYB1d8E46pwDTllpbaJEbIl5WyB+D1hQPiKdNR/650ZwMS/z5yGGdzYI AkCqrJ/khzKKNN6JWuGJKCetnqoWeZgsqjx0RjwT8xtw+Y0YIeZ0JYESKnV4YTCq+A7B nL/DdjdPArh/KKYIabaRRNfUQyhdKOuEjNUkFokXfcawkUAP8LnMCXGxnY7xwXvJiwxN Mmxg== 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=U39m63M7vqzd/S5CqZImRKJ1fwMwQvU05d/6n2kM4OY=; b=Lgj21gGjWcJonZYehvmIEJ1BVg0R+7+k9Yjn14d7NlNbGcbdqETDOnbhWNtVZNak5t j0i4+gcQyItFf669AvU+834biegttKWzcs6ifyGHDCxHBh9p92VqbviKyJ5dTcPcXd8o UtnBwYRsVHuodL5GCJ/aeUwgYtFjZiitjQFNr8OKtlxCd06VrIzgh1QTF6xfCqYBO81G Nf7sgLcRmaDpJgzBkkxxq+8Lqc7e0NVw6obcphhUR+WxDUGQx+MVJ/0ZzDDHTP1vNxps w1TjUb+9uvFH4GvsG+UPESID3GuCauUdknoHlW4FZd7Ag9JCwEAHfMQTGpfvh4u4HPdk 5gpA== X-Gm-Message-State: AOAM533vbNZ3FRV7i7LnrjTv0EyJDHnDYxJMUBML1/ounjwfbYNk7V+M gTV/2HrtUxGiZ7OyTvlrKGFuw6y12mqGcnRA X-Google-Smtp-Source: ABdhPJw1n4Sx79c5sDrueQMBCtlT3eT3wSV27EzTwXe8kX08o10o8Y2AUmEJaWTq6+JTKT2d5EUojg== X-Received: by 2002:a9d:7cd7:: with SMTP id r23mr3137028otn.228.1604724459025; Fri, 06 Nov 2020 20:47:39 -0800 (PST) Received: from localhost.localdomain ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id x25sm836888oie.17.2020.11.06.20.47.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 20:47:38 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v4 05/15] luks2: Use correct index variable when looping in luks2_get_keyslot. Date: Fri, 6 Nov 2020 22:44:25 -0600 Message-Id: <4839ead9b5c7d1b9dfc15bfa27db2852e39d6739.1604723348.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::344; envelope-from=development@efficientek.com; helo=mail-ot1-x344.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: Sat, 07 Nov 2020 04:47:47 -0000 The loop variable j should be used to index the digests and segments json array, instead of the variable i, which is the keyslot index. Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index d963255d4..be42deb14 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -275,10 +275,10 @@ 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; @@ -292,11 +292,11 @@ 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 segments"); for (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; -- 2.27.0