Re: [PATCH v7 13/17] luks2: Error check segment.sector_size

[Patrick Steinhardt]

On Fri, Dec 04, 2020 at 10:43:42AM -0600, Glenn Washburn wrote:
> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
> Signed-off-by: Glenn Washburn <development@efficientek.com>

Reviewed-by: Patrick Steinhardt <ps@pks.im>

> ---
>  grub-core/disk/luks2.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
> index 1bb3a333d..499c9330b 100644
> --- a/grub-core/disk/luks2.c
> +++ b/grub-core/disk/luks2.c
> @@ -629,6 +629,17 @@ luks2_recover_key (grub_disk_t source,
>  
>        grub_dprintf ("luks2", "Trying keyslot \"%"PRIuGRUB_UINT64_T"\"\n", 
> keyslot.json_slot_key);
>  
> +      /* Sector size should be one of 512, 1024, 2048, or 4096. */
> +      if (!(segment.sector_size == 512 || segment.sector_size == 1024 ||
> +         segment.sector_size == 2048 || segment.sector_size == 4096))
> +     {
> +       grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" sector"
> +                              " size %"PRIuGRUB_UINT64_T" is not one of"
> +                              " 512, 1024, 2048, or 4096\n",
> +                              segment.json_slot_key, segment.sector_size);
> +       continue;
> +     }
> +
>        /* Set up disk according to keyslot's segment. */
>        crypt->offset_sectors = grub_divmod64 (segment.offset, 
> segment.sector_size, NULL);
>        crypt->log_sector_size = sizeof (unsigned int) * 8
> -- 
> 2.27.0
>

signature.asc
Description: PGP signature