On Fri, Nov 06, 2020 at 10:44:25PM -0600, Glenn Washburn wrote: > 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 <developm...@efficientek.com>
Reviewed-by: Patrick Steinhardt <p...@pks.im>
> ---
> 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
>
signature.asc
Description: PGP signature
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
