From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kOqSD-0007jH-Mj for mharc-grub-devel@gnu.org; Sat, 03 Oct 2020 18:56:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kOqRs-0007ca-DN for grub-devel@gnu.org; Sat, 03 Oct 2020 18:56:19 -0400 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]:44707) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kOqRn-0000G1-Qn for grub-devel@gnu.org; Sat, 03 Oct 2020 18:56:16 -0400 Received: by mail-ot1-x342.google.com with SMTP id a2so5084626otr.11 for ; Sat, 03 Oct 2020 15:56:09 -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=Y4rXzkTSwC6hLW98TjBin+LEfGQ+MfL6CNd+Fw2uWiA=; b=DvDOzEFHqH+0G7FzyEg/KSCVZbqim3G4bIpq6ha7fKfTAT5INQ0RT3Rg5979h1Tnjx NKljq3CYkqlMcmsRabNuGM/6j3hy4Thck2PpGt09zesIvGh4jPBlwh2Mc/2gQZCrxo4h 85xNIvFZ7dvyFezumWXTmC9zd3jMAvxTj8nasQ3zmgKfoyQ7T1pAASjOZf/uKwUU5ma4 +8RS7uQhFHNWO5MMMOtUKBE9jbDjAIYn3Aq/m26HPCDk8juHfpTXo3l1D5h0bcxmyY3q hJ5LKj7HYh/G/6+UlrcByaKQAZaQBXNgiKRGqimozA/nExkWb9q/jmATA8V/17eI/aVG QMYw== 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=Y4rXzkTSwC6hLW98TjBin+LEfGQ+MfL6CNd+Fw2uWiA=; b=biLXMMLKMaixtoZPNLWKTZo1hrI2jZdw2gwDSIkLj8IMIapi2uTTzUiBvRoUZiiaHL 3cRucT5a4vubNK928Wc0rE+AtkHLYfm+qpseGRG4aCi3LcQ9zv4T0xarao/gt3vRZVP7 jrOP4i/4jRcs929YE7Pph6CwCRGrwtU/WRy93eI1wYiJtUuEV8aw5DTbmg9eQxMIQmS/ eYpSlOIV7gmxmzR8x5hzbWMppCrst+D2FmNBbXkocz88hTxQviAPPwVdVFtbc3ktILjg oAKdKkZZeZWRroynKWBLM5ZXuw1+kYS6Vcgym2ZbnH4jm8hp1mXxADxd7y9SfFBR/t0Q CnFg== X-Gm-Message-State: AOAM532UXJ8tpdzk17gMhT5e7T7pYmKxfuITSDZm6YxfOflVL2zRKWAT 5MwYGUc0cTAzIeOADvGO4X9UXXgbqdCheA== X-Google-Smtp-Source: ABdhPJyK2mJYtAfzGCzpTVCeIPGOrj5I9xRosar3wE9+fxwRR/ftpLKZK+K9hML6RRX03jCt7WroDQ== X-Received: by 2002:a9d:621a:: with SMTP id g26mr6893230otj.209.1601765768775; Sat, 03 Oct 2020 15:56:08 -0700 (PDT) Received: from crass-HP-ZBook-15-G2.lan ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id d17sm1524580oth.73.2020.10.03.15.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 15:56:08 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Daniel Kiper , Patrick Steinhardt , Glenn Washburn Subject: [PATCH v2 09/10] cryptodisk: Rename offset in grub_cryptodisk_t to offset_sectors. Date: Sat, 3 Oct 2020 17:55:33 -0500 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::342; envelope-from=development@efficientek.com; helo=mail-ot1-x342.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: Sat, 03 Oct 2020 22:56:20 -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 2e295cac8..46abc96ef 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_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<