Re: [PATCH] disk/cryptodisk: Fix missing change when updating to use grub_uuidcasecmp

[Patrick Steinhardt]

On Fri, Aug 18, 2023 at 12:27:22PM -0500, Glenn Washburn wrote:
> This was causing the cryptomount command to return failure even though
> the crypto device was successfully added. Of course, this meant that any
> script using the return code would behave unexpectedly.
> 
> Fixes: 3cf2e848bc03 (disk/cryptodisk: Allows UUIDs to be compared in a 
> dash-insensitive manner)
> 
> Suggested-by: Olaf Hering <olaf@aepfle.de>
> Signed-off-by: Glenn Washburn <development@efficientek.com>

This change looks good to me, thanks!

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

> ---
>  grub-core/disk/cryptodisk.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
> index 34b67a705fbc..fb807e2a6a27 100644
> --- a/grub-core/disk/cryptodisk.c
> +++ b/grub-core/disk/cryptodisk.c
> @@ -1236,7 +1236,8 @@ grub_cryptodisk_scan_device (const char *name,
>    dev = grub_cryptodisk_scan_device_real (name, source, cargs);
>    if (dev)
>      {
> -      ret = (cargs->search_uuid != NULL && grub_strcasecmp 
> (cargs->search_uuid, dev->uuid) == 0);
> +      ret = (cargs->search_uuid != NULL
> +          && grub_uuidcasecmp (cargs->search_uuid, dev->uuid, sizeof 
> (dev->uuid)) == 0);
>        goto cleanup;
>      }
>  
> -- 
> 2.34.1
>

signature.asc
Description: PGP signature