From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ko02C-0002lu-NP for mharc-grub-devel@gnu.org; Sat, 12 Dec 2020 03:13:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko02A-0002lk-Rt for grub-devel@gnu.org; Sat, 12 Dec 2020 03:13:42 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:44729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko027-0004P1-7m for grub-devel@gnu.org; Sat, 12 Dec 2020 03:13:42 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 9BD08779; Sat, 12 Dec 2020 03:13:37 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 12 Dec 2020 03:13:37 -0500 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=h7jhxtzIPe0V+oqoGabOQWtkVmT /WSP8lYWERBZmkkY=; b=qnO9XXIyagTn4434AS+N7qQRJ5BriYtMLpIgRA5zWrE xhXmzzqoLjQgw3DswN5wQTcS24n7ucorqunFSjPbZyjvZeaZrCpoNNPn+EyDG2tv 1KAG/jdZP4pRwGug9YNHLbdYQ/MU2y3lE4SkHhljrJtsLm1eKxHcPtGVu8NbOp32 MYtB5DCsobTJmoH/WdnSTGKzPfBhHoFeFjJeugkBNMhLMVauiMu9Z+eJN0LSZRfx IG/h1mD8TzB3Xt1HnUpvVj1nSB31PHm7Ffys0Cy6Xtofmrpv006Id2iCCCJ6b6kT z4G1UbD+NsKblXqx2f7XSV7apGX/iGpVr8YOBTGmsZQ== 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=h7jhxt zIPe0V+oqoGabOQWtkVmT/WSP8lYWERBZmkkY=; b=N6iBlBhHz9+zRjhimHHkQY loyRQSNkbvStM4wppWf9a2MbUr2T6ZZGqjo6DkmtuKdLBHJLOOhrgPSsz6PCea1C poKb4eEQSp6CL1NHMdp8TyFPwvo9odJYL9EiAx5fGl37lLSTp5i9ax+a6v4+Qu+N xHjhnsLpShM0jovX9/1m6LBH1xoSgAz33nM8ecVPuCGMhM2DazfdBaIrTuJI7mT/ 9NvkJSXY2iUmHZzRIV7uZLfP4yT6rklnwowV6docX4oTTkjculy40JKefHHM0/V3 ihT+q4o2AYJJkX6/PVBOVeyQ14oq4lN+3ox/dq8vEgewzzkM1UytJn3EkiysZoDw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudekfedguddulecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepheeghfdtfeeuffehkefgffduleffjedthfdvjeektdfhhedvlefgtefgvdettdfh necukfhppeejjedrudeluddruddtrdduleegnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail (x4dbf0ac2.dyn.telefonica.de [77.191.10.194]) by mail.messagingengine.com (Postfix) with ESMTPA id 0A1C824005B; Sat, 12 Dec 2020 03:13:35 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id abe00416 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 12 Dec 2020 08:13:34 +0000 (UTC) Date: Sat, 12 Dec 2020 09:13:33 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v8 11/18] cryptodisk: Add macros GRUB_TYPE_U_MAX/MIN(type) to replace literals Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wk/R9RhjnaCDw6Tb" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=64.147.123.25; envelope-from=ps@pks.im; helo=wout2-smtp.messagingengine.com 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: Sat, 12 Dec 2020 08:13:43 -0000 --wk/R9RhjnaCDw6Tb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 08, 2020 at 04:45:42PM -0600, Glenn Washburn wrote: > Add GRUB_TYPE_U_MAX/MIN(type) macros to get the max/min values for an > unsigned number with size of type. >=20 > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/cryptodisk.c | 8 ++++---- > include/grub/types.h | 7 +++++++ > 2 files changed, 11 insertions(+), 4 deletions(-) >=20 > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index 0e955a020..5aa0c4720 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -284,23 +284,23 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > iv[1] =3D grub_cpu_to_le32 (sector >> GRUB_TYPE_BITS (iv[0])); > /* FALLTHROUGH */ > case GRUB_CRYPTODISK_MODE_IV_PLAIN: > - iv[0] =3D grub_cpu_to_le32 (sector & 0xFFFFFFFF); > + iv[0] =3D grub_cpu_to_le32 (sector & GRUB_TYPE_U_MAX (iv[0])); > break; > case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64: > iv[1] =3D grub_cpu_to_le32 (sector >> (GRUB_TYPE_BITS (iv[1]) > - dev->log_sector_size)); > iv[0] =3D grub_cpu_to_le32 ((sector << dev->log_sector_size) > - & 0xFFFFFFFF); > + & GRUB_TYPE_U_MAX (iv[0])); > break; > case GRUB_CRYPTODISK_MODE_IV_BENBI: > { > grub_uint64_t num =3D (sector << dev->benbi_log) + 1; > iv[sz - 2] =3D grub_cpu_to_be32 (num >> GRUB_TYPE_BITS (iv[0])); > - iv[sz - 1] =3D grub_cpu_to_be32 (num & 0xFFFFFFFF); > + iv[sz - 1] =3D grub_cpu_to_be32 (num & GRUB_TYPE_U_MAX (iv[0])); > } > break; > case GRUB_CRYPTODISK_MODE_IV_ESSIV: > - iv[0] =3D grub_cpu_to_le32 (sector & 0xFFFFFFFF); > + iv[0] =3D grub_cpu_to_le32 (sector & GRUB_TYPE_U_MAX (iv[0])); > err =3D grub_crypto_ecb_encrypt (dev->essiv_cipher, iv, iv, > dev->cipher->cipher->blocksize); > if (err) > diff --git a/include/grub/types.h b/include/grub/types.h > index 9989e3a16..b36b26a79 100644 > --- a/include/grub/types.h > +++ b/include/grub/types.h > @@ -161,6 +161,13 @@ typedef grub_int32_t grub_ssize_t; > #endif > # define GRUB_LONG_MIN (-GRUB_LONG_MAX - 1) > =20 > +/* > + * Cast to unsigned long long so that the "return value" is always a con= sistent > + * type and to ensure an unsigned value regardless of type parameter. > + */ > +#define GRUB_TYPE_U_MAX(type) ((unsigned long long)((typeof (type))(~0))) > +#define GRUB_TYPE_U_MIN(type) 0ULL > + > typedef grub_uint64_t grub_properly_aligned_t; > =20 > #define GRUB_PROPERLY_ALIGNED_ARRAY(name, size) grub_properly_aligned_t = name[((size) + sizeof (grub_properly_aligned_t) - 1) / sizeof (grub_properl= y_aligned_t)] > --=20 > 2.27.0 >=20 --wk/R9RhjnaCDw6Tb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/Ue6wACgkQVbJhu7ck PpR1Zw/7Bvbu9pbspKArvBDWFiUSZU6BDY5umlK7EiwsZKDn98MD1xR2ZGThmI/Z CLiZScPB7hkUlNSAFwQZ1/rhqI+7porf5HFGTHr5ET9kRl4t36sRw7w0DgyEHJ00 mBs4d2K/GwEnTcQJMtDvhagUKhRPQaJ4dfb0RPbW+D+nRn3LpcGWz7b7/W1fwH+/ WD2E4FnfEAZHpoksXlYOuUlxHQzpeQzSfsVZyK/79xpumlofRp42K8oHdcaDpcnB SOwYdhhmGVWmRbjzeJJlDfEAqoaWwrT5zlhf6h4oh/PPxUYf4wTEamjUKbJB2s/w H+7M0sxufYTviQ3V+5vMwcz6/+Em0eZBJ5o5OUHqgInKOCTrfRhkze2Eg0N1o6tU VhumecdUNE1ZyU1Dh9KPHTY5TRQz+eH0lPoLoLVNs2iRJkdnnDWz8g9Ja00R/f6J qQHWXDdhmgoZzLtapaXjf9Vsrj0P1Qz1k4dS9SDVhu1i3d2at4aQnf7eBgM9Lvjs /RA3tZqpB2eXUukvVB9hz08b08T/phwrzjb+xK+8sSkz0RYE7+fVDyO/AjBkM7S4 xVITEe2US2ngbsg63FbjBesfd8GzGgCvmUOJ1J/zKNEAWhpJ3fP2H5k02CqNgMIO jjYDbjR9ukQ+GC7lt/2aflEf2EOEO1XoCEuo4lj98zvn3UM5Reo= =bdPQ -----END PGP SIGNATURE----- --wk/R9RhjnaCDw6Tb--