Re: [PATCH 3/9] luks2: Fix use of incorrect index and some error messages

[Glenn Washburn]

Was it intentional to include the old/original version of this patch
which you requested to be changed to make it more readable?  There is
an updated patch with subject "[CRYPTO-LUKS v1 18/19] luks2: Fix use of
incorrect index and some error messages.".

Glenn

On Sun, 23 Aug 2020 13:03:07 +0200
Patrick Steinhardt <ps@pks.im> wrote:

> From: Glenn Washburn <development@efficientek.com>
> 
> Signed-off-by: Glenn Washburn <development@efficientek.com>
> Reviewed-by: Patrick Steinhardt <ps@pks.im>
> ---
>  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 e3ff7c83d..200f81d3a 100644
> --- a/grub-core/disk/luks2.c
> +++ b/grub-core/disk/luks2.c
> @@ -275,34 +275,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;
>  }