From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kQp8d-0003Fc-Td for mharc-grub-devel@gnu.org; Fri, 09 Oct 2020 05:56:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQp8c-0003FP-Em for grub-devel@gnu.org; Fri, 09 Oct 2020 05:56:34 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:46589) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQp8a-0007K5-JN for grub-devel@gnu.org; Fri, 09 Oct 2020 05:56:34 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 268C55C00FB; Fri, 9 Oct 2020 05:56:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 09 Oct 2020 05:56:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=JMjr67Mkt7fkcyAn40vMCyL88qB ZR+a4CZs/iYPStLo=; b=n8mKAuvbSP4asoLjqXEYfj0wdDeyGXddkXFBCFkRl/D xhy9PpLJZ+899kO6diEMBXvYPv+aJuJ8sFRVCUmqH6GoT0BO5Tcx6kuH29/YCKIT TX8EXveLE0NFj7HmRfi37n+P5UMd97S06fxKcjQx/51KTCSAzrjjUeJVcnz/XHsJ 9mH2KxmAE8jxD1Eth3eOqAp+vQt7ZwFC8YG9XBDsz8LOtlWkcDlwUddIK71uiqM3 WHAg6NhgE9L40Y+Il2QfoMyaFMowKPAL9qk+cvoQh6ovzXP2dLXH7ZFFvOhn+LH8 zYesM5T+HL/erhDxsTiasG8My5i7jCwf3azrjbKPOqA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=JMjr67 Mkt7fkcyAn40vMCyL88qBZR+a4CZs/iYPStLo=; b=pa/1QJUEYpY+mAvsHqDpRZ ItjvNJIbmi/N0mNC++G54lQMfvqtnacDR+ojAMC+3PBGYMvLyr3ifaSggzSCuOF2 cbcSBKImmIcBw1v2YtKXKq+zj63UtsPQLQIWLbMnLEbwzErjFVGaVyucTfpA46UF DF0evAn7+GhrCq+uY0jnjdnlYiB/HJtCuJeXpgW1KKxt/aVfzygmVFXCjhmZ+83K zf+I1Oqd/yZrtjdxWgCkuGhhSfe3sNvUXnktRB+0I8VIg6Ae69nRuqP6pNyEzfGC JVCXD+gAWrPnyAP8XJbGMr3Q0DIVHW5j6mlnlfPiAtbZM91h6KrJm8KzFDOFmb/A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrhedugddvfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhrihgt khcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnh epheeghfdtfeeuffehkefgffduleffjedthfdvjeektdfhhedvlefgtefgvdettdfhnecu kfhppeejkedrheegrdefvddrudefgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-054-032-134.78.54.pool.telefonica.de [78.54.32.134]) by mail.messagingengine.com (Postfix) with ESMTPA id F06E9328005A; Fri, 9 Oct 2020 05:56:30 -0400 (EDT) Received: from localhost (tanuki [10.192.0.23]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 3f91c36a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Oct 2020 09:56:29 +0000 (UTC) Date: Fri, 9 Oct 2020 11:56:33 +0200 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v2 09/10] cryptodisk: Rename offset in grub_cryptodisk_t to offset_sectors. Message-ID: <20201009095633.GF2088@tanuki> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="FeAIMMcddNRN4P4/" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=66.111.4.26; envelope-from=ps@pks.im; helo=out2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 05:22:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: Fri, 09 Oct 2020 09:56:34 -0000 --FeAIMMcddNRN4P4/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Oct 03, 2020 at 05:55:33PM -0500, Glenn Washburn wrote: > This makes it clear that the offset represents sectors, not bytes, in ord= er > to improve readability. >=20 > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt > --- > 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(-) >=20 > 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_a= ddr_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); > =20 > err =3D 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_ad= dr_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); > =20 > gcry_err =3D 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_ad= dr_t sector, > } > =20 > /* Since ->write was called so disk.mod is loaded but be paranoid */ > - sector =3D sector + dev->offset; > + sector =3D sector + dev->offset_sectors; > if (grub_disk_write_weak) > err =3D 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 =3D grub_stpcpy (ptr, "luks_mount "); > ptr =3D grub_stpcpy (ptr, i->uuid); > *ptr++ =3D ' '; > - grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset); > + grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset_sectors); > while (*ptr) > ptr++; > for (iptr =3D 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 *chec= k_uuid, > } > newdev->cipher =3D cipher; > newdev->secondary_cipher =3D secondary_cipher; > - newdev->offset =3D 0; > + newdev->offset_sectors =3D 0; > newdev->source_disk =3D NULL; > newdev->benbi_log =3D 0; > if (grub_le_to_cpu16 (header.alg) =3D=3D 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 *ch= eck_uuid, > newdev =3D grub_zalloc (sizeof (struct grub_cryptodisk)); > if (!newdev) > return NULL; > - newdev->offset =3D grub_be_to_cpu32 (header.payloadOffset); > + newdev->offset_sectors =3D grub_be_to_cpu32 (header.payloadOffset); > newdev->source_disk =3D NULL; > newdev->log_sector_size =3D LUKS1_LOG_SECTOR_SIZE; > - newdev->total_sectors =3D grub_disk_get_size (disk) - newdev->offset; > + newdev->total_sectors =3D grub_disk_get_size (disk) - newdev->offset_s= ectors; > grub_memcpy (newdev->uuid, uuid, sizeof (uuid)); > newdev->modname =3D "luks"; > =20 > 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", ke= yslot_key); > =20 > /* Set up disk according to keyslot's segment. */ > - crypt->offset =3D grub_divmod64 (segment.offset, segment.sector_si= ze, NULL); > + crypt->offset_sectors =3D grub_divmod64 (segment.offset, segment.s= ector_size, NULL); > crypt->log_sector_size =3D sizeof (unsigned int) * 8 > - __builtin_clz ((unsigned int) segment.sector_size) - 1; > if (grub_strcmp (segment.size, "dynamic") =3D=3D 0) > crypt->total_sectors =3D (grub_disk_get_size (disk) >> (crypt->log_sect= or_size - disk->log_sector_size)) > - - crypt->offset; > + - crypt->offset_sectors; > else > crypt->total_sectors =3D grub_strtoull (segment.size, NULL, 10) >> cryp= t->log_sector_size; > =20 > 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; > =20 > char *source; > - grub_disk_addr_t offset; > + > + /* > + * The number of sectors the start of the encrypted data is offset int= o the > + * underlying disk, where sectors are the size noted by log_sector_siz= e. > + */ > + grub_disk_addr_t offset_sectors; > /* Total number of encrypted sectors of size (1< grub_disk_addr_t total_sectors; > grub_disk_t source_disk; > --=20 > 2.27.0 >=20 --FeAIMMcddNRN4P4/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+AM9AACgkQVbJhu7ck PpRcfBAAnHUd/4olTMCUz49RLCv3Z1AL/bhLVNoFIYITNT88esHuJ6KF7PC+Hblf yy7IvQiHllk+LgIlGtZ/EOXIrpcXPg6lZAZXJNcT6Y72RlwIMZhc+Q3+MKoA3luf TqYCIMyQIxtLJjYjaYEvr+yaDpu9VUq7GCu0Zj119/rOXgsdeXpopAiuwP4+lv/n nJthNuzJdUSMPBEaOeFC3fxAPNfS9cfvmoWRXGBwobIPbJdHsWe3GNdGsAMJnRM2 KI3CGllC2YB2tmjWant1LevGc72x03q426ubCiaHhZrB/sn4g72zH0FzC7+Wh6t8 npsLyz8jnPHQxtfJ5acwz7z/S0Xg9GN2kDyL5AjeGkWGX7GQDqJjlIHNwoKq6xVc mCyuibM6zw90pva0bw1Hrq+1VGYxjAV5vrBoEiwE28kyMq9oScoFqtdFQhw7FxjY QcaKTUn4Wxo72o5DnDfalT5k4CNQPuUun47EUcY1qeHrZ/CwXxzMxc7xu8ZkcDeN iWsLKfqyip67FGCahSl9ti66YmXoFHanGW6vNgbDQXs7LCIlNUSIwx5RJu0liAE9 zhsE7/T0oOpz9mwcLHcyeOYNoElBWBXxvvHc4St4iG6GJeYn9bCuL2xf7hDP7RHz yVT2O+yNv2N+7HbwvrT7328Ex2mvVU8zIQj5RMfx1r/8Ua9Wu+c= =5M1d -----END PGP SIGNATURE----- --FeAIMMcddNRN4P4/--