From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kUeKh-0000gm-JD for mharc-grub-devel@gnu.org; Mon, 19 Oct 2020 19:12:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUeKe-0000a3-Hp for grub-devel@gnu.org; Mon, 19 Oct 2020 19:12:48 -0400 Received: from mail-ot1-x341.google.com ([2607:f8b0:4864:20::341]:33597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kUeKY-0007Vb-PL for grub-devel@gnu.org; Mon, 19 Oct 2020 19:12:48 -0400 Received: by mail-ot1-x341.google.com with SMTP id t15so1531198otk.0 for ; Mon, 19 Oct 2020 16:12:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rSHuggk611mfJ+cH+lburs4d02QTkWVsNShAMDXfMMc=; b=IqGWeApEsEN8WrnGa68P0kHRBVbTW/RnrzBHsXhVmTqVSTUmzmjZBfFx291akQMSxB vDb2WMTBNvVU+K8lDTpeFFrXvXslwyqmCJurHbxp2qZZcDmW6c0b9+QQRKFJL638lUwn WezzAZ3p6sSuFoGOg3qUfwVhAMijoZtS2bXsZzOsQ5yY/FIyyff5lsgT3IQHkxM/Uyvr cPOew7hljMoEy7X60ja3/gkSNGGOUwyAl53lXDXXJY41WoxW6chUOVTzmjU6QvN2nDSd crhyjcSPKSFteoA8B/vym7chFrBWeZdbKrRt/G8iXa2CRBbbJ0RLNOqZRxgvGFwy3RBF mmfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rSHuggk611mfJ+cH+lburs4d02QTkWVsNShAMDXfMMc=; b=LYW9Ud8Eye+OJ16rDU9Nco22ZPRHZtP5b3vS3aKHQOrv0pMa/pLJA9hCRV7+Jh04IF Gqfeb8anl6o2hXycK7xvBn4iBtlT077PvJ1j8go6d9jrxU7u5V8L2XSeQL1rTRj7a10e xBDd+t9QUP5/DQ3eO0QDz5afXASgvTAbHaiwriRbyawWS+6qM9G5ZbO6w7EzxYHcNwn5 8zS+0kHjgjuAO3Vb5A38Vq5aJOIOI92NhPBebThMtrkMnKY2HTWPh5WwGC055bAqAd4f ev7XP+FyGQR0PcjXElZnnVOK+3u6k1TRe5tmwUW9w89Tv2fgxmxaOb2SqlFTlYlRq0Q2 grgw== X-Gm-Message-State: AOAM533C6NUsea1R9qiSBUv/FDQBxKnvL3Lyk2X4aGK0HtIyT9MbsuGi 6112+AMp0zo/OKt/P+qCHXLiZx6tV5YWrQ== X-Google-Smtp-Source: ABdhPJwFPrxSLUUFd9XDfa/squEBugD0zf4Whi7CYo09aFy7fpEbDU+ePitnFNVrHaMFQDBKWxAJ9Q== X-Received: by 2002:a9d:638d:: with SMTP id w13mr1579560otk.32.1603149161205; Mon, 19 Oct 2020 16:12:41 -0700 (PDT) Received: from localhost.localdomain (47-218-232-180.bcstcmtk03.res.dyn.suddenlink.net. [47.218.232.180]) by smtp.gmail.com with ESMTPSA id d27sm310848otc.6.2020.10.19.16.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 16:12:40 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v3 09/10] cryptodisk: Rename offset in grub_cryptodisk_t to offset_sectors. Date: Mon, 19 Oct 2020 18:09:57 -0500 Message-Id: <74c6232c9b707d7c3a3236969a6e3f8744e563d5.1603148099.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: <20201009100122.GH2088@tanuki> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::341; envelope-from=development@efficientek.com; helo=mail-ot1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 23:12:48 -0000 This makes it clear that the offset represents sectors, not bytes, in order to improve readability. Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 10 +++++----- grub-core/disk/geli.c | 2 +- grub-core/disk/luks.c | 4 ++-- grub-core/disk/luks2.c | 4 ++-- include/grub/cryptodisk.h | 7 ++++++- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index f5d098f65..64a51165c 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -766,10 +766,10 @@ grub_cryptodisk_read (grub_disk_t disk, grub_disk_addr_t sector, grub_dprintf ("cryptodisk", "Reading %" PRIuGRUB_SIZE " sectors from sector 0x%" PRIxGRUB_UINT64_T " with offset of %" PRIuGRUB_UINT64_T "\n", - size, sector, dev->offset); + size, sector, dev->offset_sectors); err = grub_disk_read (dev->source_disk, - grub_disk_from_native_sector (disk, sector + dev->offset), + grub_disk_from_native_sector (disk, sector + dev->offset_sectors), 0, size << disk->log_sector_size, buf); if (err) { @@ -815,7 +815,7 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_addr_t sector, grub_dprintf ("cryptodisk", "Writing %" PRIuGRUB_SIZE " sectors to sector 0x%" PRIxGRUB_UINT64_T " with offset of %" PRIuGRUB_UINT64_T "\n", - size, sector, dev->offset); + size, sector, dev->offset_sectors); gcry_err = grub_cryptodisk_endecrypt (dev, (grub_uint8_t *) tmp, size << disk->log_sector_size, @@ -827,7 +827,7 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_addr_t sector, } /* Since ->write was called so disk.mod is loaded but be paranoid */ - sector = sector + dev->offset; + sector = sector + dev->offset_sectors; if (grub_disk_write_weak) err = grub_disk_write_weak (dev->source_disk, grub_disk_from_native_sector (disk, sector), @@ -1240,7 +1240,7 @@ luks_script_get (grub_size_t *sz) ptr = grub_stpcpy (ptr, "luks_mount "); ptr = grub_stpcpy (ptr, i->uuid); *ptr++ = ' '; - grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset); + grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset_sectors); while (*ptr) ptr++; for (iptr = i->cipher->cipher->name; *iptr; iptr++) diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c index 4ec875821..0175ce4c4 100644 --- a/grub-core/disk/geli.c +++ b/grub-core/disk/geli.c @@ -361,7 +361,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, } newdev->cipher = cipher; newdev->secondary_cipher = secondary_cipher; - newdev->offset = 0; + newdev->offset_sectors = 0; newdev->source_disk = NULL; newdev->benbi_log = 0; if (grub_le_to_cpu16 (header.alg) == 0x16) diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c index 545734342..88f2da493 100644 --- a/grub-core/disk/luks.c +++ b/grub-core/disk/luks.c @@ -122,10 +122,10 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, newdev = grub_zalloc (sizeof (struct grub_cryptodisk)); if (!newdev) return NULL; - newdev->offset = grub_be_to_cpu32 (header.payloadOffset); + newdev->offset_sectors = grub_be_to_cpu32 (header.payloadOffset); newdev->source_disk = NULL; newdev->log_sector_size = LUKS1_LOG_SECTOR_SIZE; - newdev->total_sectors = grub_disk_get_size (disk) - newdev->offset; + newdev->total_sectors = grub_disk_get_size (disk) - newdev->offset_sectors; 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 bae54936c..cd573208a 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -612,12 +612,12 @@ luks2_recover_key (grub_disk_t disk, grub_dprintf ("luks2", "Trying keyslot %"PRIuGRUB_UINT64_T"\n", keyslot.slot_key); /* Set up disk according to keyslot's segment. */ - crypt->offset = grub_divmod64 (segment.offset, segment.sector_size, NULL); + crypt->offset_sectors = grub_divmod64 (segment.offset, segment.sector_size, NULL); 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_sectors = (grub_disk_get_size (disk) >> (crypt->log_sector_size - disk->log_sector_size)) - - crypt->offset; + - crypt->offset_sectors; else crypt->total_sectors = grub_strtoull (segment.size, NULL, 10) >> crypt->log_sector_size; diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h index 9e10ae927..c8eef2204 100644 --- a/include/grub/cryptodisk.h +++ b/include/grub/cryptodisk.h @@ -72,7 +72,12 @@ struct grub_cryptodisk struct grub_cryptodisk **prev; char *source; - grub_disk_addr_t offset; + + /* + * The number of sectors the start of the encrypted data is offset into the + * underlying disk, where sectors are the size noted by log_sector_size. + */ + grub_disk_addr_t offset_sectors; /* Total number of encrypted sectors of size (1<