[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 01/15] cryptodisk: Rename total_length field in grub_crypt
From: |
Patrick Steinhardt |
Subject: |
Re: [PATCH v4 01/15] cryptodisk: Rename total_length field in grub_cryptodisk_t to total_sectors. |
Date: |
Sun, 15 Nov 2020 10:37:23 +0100 |
On Fri, Nov 06, 2020 at 10:44:21PM -0600, Glenn Washburn wrote:
> This creates an alignment with grub_disk_t naming of the same field and is
> more intuitive as to how it should be used.
>
> Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
> ---
> grub-core/disk/cryptodisk.c | 2 +-
> grub-core/disk/geli.c | 2 +-
> grub-core/disk/luks.c | 2 +-
> grub-core/disk/luks2.c | 4 ++--
> include/grub/cryptodisk.h | 3 ++-
> 5 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
> index a3d672f68..3703da221 100644
> --- a/grub-core/disk/cryptodisk.c
> +++ b/grub-core/disk/cryptodisk.c
> @@ -699,7 +699,7 @@ grub_cryptodisk_open (const char *name, grub_disk_t disk)
> }
>
> disk->data = dev;
> - disk->total_sectors = dev->total_length;
> + disk->total_sectors = dev->total_sectors;
> disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
> disk->id = dev->id;
> dev->ref++;
> diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
> index e9d23299a..4ec875821 100644
> --- a/grub-core/disk/geli.c
> +++ b/grub-core/disk/geli.c
> @@ -391,7 +391,7 @@ configure_ciphers (grub_disk_t disk, const char
> *check_uuid,
>
> newdev->modname = "geli";
>
> - newdev->total_length = grub_disk_get_size (disk) - 1;
> + newdev->total_sectors = grub_disk_get_size (disk) - 1;
> grub_memcpy (newdev->uuid, uuid, sizeof (newdev->uuid));
> COMPILE_TIME_ASSERT (sizeof (newdev->uuid) >= 32 * 2 + 1);
> return newdev;
> diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c
> index 59702067a..429db4ad8 100644
> --- a/grub-core/disk/luks.c
> +++ b/grub-core/disk/luks.c
> @@ -125,7 +125,7 @@ configure_ciphers (grub_disk_t disk, const char
> *check_uuid,
> newdev->offset = grub_be_to_cpu32 (header.payloadOffset);
> newdev->source_disk = NULL;
> newdev->log_sector_size = 9;
> - newdev->total_length = grub_disk_get_size (disk) - newdev->offset;
> + newdev->total_sectors = grub_disk_get_size (disk) - newdev->offset;
> grub_memcpy (newdev->uuid, uuid, sizeof (uuid));
> newdev->modname = "luks";
>
> diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
> index 31d7166fc..3173a098d 100644
> --- a/grub-core/disk/luks2.c
> +++ b/grub-core/disk/luks2.c
> @@ -609,9 +609,9 @@ luks2_recover_key (grub_disk_t disk,
> crypt->log_sector_size = sizeof (unsigned int) * 8
> - __builtin_clz ((unsigned int) segment.sector_size) - 1;
> if (grub_strcmp (segment.size, "dynamic") == 0)
> - crypt->total_length = grub_disk_get_size (disk) - crypt->offset;
> + crypt->total_sectors = grub_disk_get_size (disk) - crypt->offset;
> else
> - crypt->total_length = grub_strtoull (segment.size, NULL, 10);
> + crypt->total_sectors = grub_strtoull (segment.size, NULL, 10);
>
> ret = luks2_decrypt_key (candidate_key, disk, crypt, &keyslot,
> (const grub_uint8_t *) passphrase, grub_strlen
> (passphrase));
> diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h
> index e1b21e785..21dc69501 100644
> --- a/include/grub/cryptodisk.h
> +++ b/include/grub/cryptodisk.h
> @@ -67,7 +67,8 @@ struct grub_cryptodisk
>
> char *source;
> grub_disk_addr_t offset;
> - grub_disk_addr_t total_length;
> + /* Total number of encrypted sectors of size (1<<log_sector_size) */
> + grub_disk_addr_t total_sectors;
> grub_disk_t source_disk;
> int ref;
> grub_crypto_cipher_handle_t cipher;
> --
> 2.27.0
>
signature.asc
Description: PGP signature
- [PATCH v4 00/15] Cryptodisk fixes for v2.06 redux, Glenn Washburn, 2020/11/06
- [PATCH v4 02/15] cryptodisk: Rename offset in grub_cryptodisk_t to offset_sectors., Glenn Washburn, 2020/11/06
- [PATCH v4 06/15] luks2: Rename variable i to keyslot_idx in luks2_get_keyslot., Glenn Washburn, 2020/11/06
- [PATCH v4 01/15] cryptodisk: Rename total_length field in grub_cryptodisk_t to total_sectors., Glenn Washburn, 2020/11/06
- Re: [PATCH v4 01/15] cryptodisk: Rename total_length field in grub_cryptodisk_t to total_sectors.,
Patrick Steinhardt <=
- [PATCH v4 04/15] types: Define GRUB_CHAR_BIT based on compiler macro instead of using literal., Glenn Washburn, 2020/11/06
- [PATCH v4 03/15] luks2: Rename source disk variabled named 'disk' to 'source' as in luks.c., Glenn Washburn, 2020/11/06
- [PATCH v4 08/15] luks2: Split idx into three variables: keyslot_key, digest_key, segment_key., Glenn Washburn, 2020/11/06