From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kW1KS-0006RN-HI for mharc-grub-devel@gnu.org; Fri, 23 Oct 2020 13:58:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW1KQ-0006R3-M1 for grub-devel@gnu.org; Fri, 23 Oct 2020 13:58:14 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:55185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW1KO-0004Wj-9F for grub-devel@gnu.org; Fri, 23 Oct 2020 13:58:14 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 21095773; Fri, 23 Oct 2020 13:58:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 23 Oct 2020 13:58:10 -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=hdzXP3S+ZNlJsE8UQDhZIUncC7z t8leJ+qDVjQ284ok=; b=X+WH4bKXRjQq4Qq6Q7lk6tz/7gEQRQrGakUZ1lFi+RI LONOXSfF7MWsAMPSotuyBiOJNi1mfYl3yEt7AX3fg8TiRVz/bocPd+in82APIfoi 5tLXa1HihjEFbW4r9yf/ulpZPjczSqBP2Bp2C04By363IV0Nf17YCDrQZidHWQkU uCYEUxe1BLNE6mNwkE3KFJEso4ddA/Y5TPdG+rZp9EF3/fxKgh+pClfKku90Z5SM pgmgjViy0eHHOBSgA1icpp86N0na+EeQJ4mHzmi58CdEX2eEAerN4V0TIwL3GRrL fWilLvyog2RcJ0eZcZnTFNWy1QrQ42M4KLVrNkhBjcA== 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=hdzXP3 S+ZNlJsE8UQDhZIUncC7zt8leJ+qDVjQ284ok=; b=gif/FZM/KRT2a5xsezrIYo wcba6KN7JIZ3BrZh2jEU4cQdIorzuA7Hx8DBwaayoyQVCOf1QIdMVWhbhBmYTCG4 L2pkHPcl+3zYzEZYVi4S61ppEVDE15JtpFUcB8i3aJdCZvJyH9/AJIC9XgOTybNs 3M0Bsi2eKliqA3GzhDLkaopU3nH2QQ6kOSA2YlKVO7FPYlddZB9Zs+Gl1sI8Zw+W AvfuaYzOWlgEHtkWBabD2N5Dbd9y9GXKCUa0ASlzmFeuZ++Jlt12fB9RzEpm0dxo XtBJNdj26cBACQOxWuKOOewq78J2/GkFIiOqkno1o0XeygpHBJEZ3eOzhmHJR4uw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkedtgdduvddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepkeelrddugedrgeeirddvtddtnecuvehluhhsthgvrhfuihiivgepudenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-089-014-046-200.89.14.pool.telefonica.de [89.14.46.200]) by mail.messagingengine.com (Postfix) with ESMTPA id 4A739328005D; Fri, 23 Oct 2020 13:58:08 -0400 (EDT) Received: from localhost (tanuki [10.192.0.23]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 478849b1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 23 Oct 2020 17:58:06 +0000 (UTC) Date: Fri, 23 Oct 2020 19:58:13 +0200 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v3 09/10] cryptodisk: Rename offset in grub_cryptodisk_t to offset_sectors. Message-ID: <20201023175813.GD810@tanuki> References: <20201009100122.GH2088@tanuki> <74c6232c9b707d7c3a3236969a6e3f8744e563d5.1603148099.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="oj4kGyHlBMXGt3Le" Content-Disposition: inline In-Reply-To: <74c6232c9b707d7c3a3236969a6e3f8744e563d5.1603148099.git.development@efficientek.com> Received-SPF: pass client-ip=64.147.123.20; envelope-from=ps@pks.im; helo=wout4-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 13:46:38 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, 23 Oct 2020 17:58:14 -0000 --oj4kGyHlBMXGt3Le Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 19, 2020 at 06:09:57PM -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 Patrick > --- > 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 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", ke= yslot.slot_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 --oj4kGyHlBMXGt3Le Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+TGbQACgkQVbJhu7ck PpR9ng//Upwy5MV796eZxn87HpifZ8IvBWnAASKdrpbv+to9WIHo1EPd/ehtoTgC OFOIXZA5hCfvg7BiUBp+CutmwmX5krxlpqvGqtBXXPMi1f3AeOEqZ9pFFoqru5k3 wOmFUYD4Oj1XsHDmx9186O0b5ri0U2xXpWp6mcRni9VNZRPZu1ufGLUC2Fdf4LwZ rXhbq93uCIY2rjuOwDTcXb/+LyCq6K+lWQkT0c1jCMjs/M3LHZ8FWmKFnvHVy5DY 68uDq6m56FP5Qwpr62Fscj3opGphsUr+jySBSEcMBSXrBsxi/k8RnOWS+rI9RTAK aSYHZh5XlAiJsBKxDMHPWtIlA1PyrSTBIcM/wNUtoqvdkPoYVKJBx3SdVxlXmrps rvOft1FM1GD5D+XvM7ZiHM4YpliQ+cdj3kBSfNVvQhKXilLLxYNWJ8Dvw0rM0Gsj Clv2AS81LkG7CDXkL69R5LmP/ebD6sZMCYa8BrWxmQmBeK8/LyCub/zmLq43M/vj DpKIWhtAeizk3Ssh2tcRMYqEqVLW0ND0SS7aRRz1rXtm7KEQTp1daRnCj2CvmB+u E1mkFculwORoTOFMpuMGqzLmLKtGOp82GsSwiztGRA76QPAh77IuMKm8IrFydWW6 Y5S3Xa3Hnc/xVeVlgMRwlv+y362LbS0AO97gaK3SJd8Ueqw1bP4= =J0PN -----END PGP SIGNATURE----- --oj4kGyHlBMXGt3Le--