From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kluB2-0008G5-C8 for mharc-grub-devel@gnu.org; Sun, 06 Dec 2020 08:34:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kluAy-0008Ff-F0 for grub-devel@gnu.org; Sun, 06 Dec 2020 08:34:09 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:47841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kluAu-0004Yx-Gm for grub-devel@gnu.org; Sun, 06 Dec 2020 08:34:08 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 0A2D6A50; Sun, 6 Dec 2020 08:34:02 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 06 Dec 2020 08:34:03 -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=qYwd9CggC0u7bloFynnyGiJKAAV TubmuHj3UISMrJMQ=; b=sZx2fxoimXbx6I2qtYGOwIkhzHUtJ4bNE2kLGL17K3b 3OJ8zuInF+y4BTRvOnNEollN3Pt227Du/KhHKdTenKWfSvsJdpBSW5Fp7S/fp8uO V5WasNXLXbnIHQt+yk1hw8YNQBqLBIFGr4DalJSVHnbT98T7zSsQuS4uSwQLrCHl s2UPsRPv+FQRVg0uSZEgDE87ikHf4H8fDtmkxrCnjDUNfwq4EBIVEvcSpVfqcxkx 0ttGm8WiAOXJKD9+cX+WdPg4JBxt7SKK2SPQnsCc1f3b2DHAz1FyFUNLzTVlNJx+ dyoKnk7JuuKwA6KJ30lAYDMwWbx147EQx13UyQHuQng== 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=qYwd9C ggC0u7bloFynnyGiJKAAVTubmuHj3UISMrJMQ=; b=o5nX4+M/yvRwex8vYW4R2E 6Ffbe5SMZVNxDMsijrapTPEZ4TgF8tODrGCMBFWqAR4R5Nqt4S+EV+90DYUz6MGu HXxqeyC/RFIwuY9njKKjHFDzbjnTiwzvTNu9mD4trPA6RhCmZA4otEB1lBE4ciVa wjhIGQ1GR7jFRPzpY/Xg0oKVbxjV9+6Mi3bTCCiopiqKW+XMMFR5H3jf/G9k/azK VOWI+wzWOqlbQwnDptutZmLkltxcnU7KoXwcp4j2aByLDbNmGh/1dR+TrEd6f0wS GWbcTZYZnOdwjq2mv4PouzM/qolITblurDUj67n0SdqSSFcDaMlk41GbxyoLBPiQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejvddgheegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrddukeefrddujedruddutdenucevlhhushhtvghrufhiiigvpeefnecurf grrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail (x4db7116e.dyn.telefonica.de [77.183.17.110]) by mail.messagingengine.com (Postfix) with ESMTPA id 86238108005F; Sun, 6 Dec 2020 08:34:01 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id 8cebe8a0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 6 Dec 2020 13:33:59 +0000 (UTC) Date: Sun, 6 Dec 2020 14:33:59 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v7 09/17] 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="xFAmhKQubiDuYx90" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=64.147.123.24; envelope-from=ps@pks.im; helo=wout1-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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Sun, 06 Dec 2020 13:34:10 -0000 --xFAmhKQubiDuYx90 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 04, 2020 at 10:43:38AM -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 > --- > 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..0542011cc 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 cons= istent > + 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 > + Nit: multi-line comments do use the following format: /* * Foo bar * bar foo / Other than that: Reviewed-by: Patrick Steinhardt > 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 --xFAmhKQubiDuYx90 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/M3cYACgkQVbJhu7ck PpSz5Q/7Bz/NFGGYd6b2UsWMBZ19KIHBH1zvT32xTVVfnLGs7D2XlCHIF/7xVTpX 5b1iFHgA2ED49RbUkFHNuopz/hPq+0+csJRFv7Y42uuWVPq5mIHMO6rbiINEXnmt 56EV9u8CSfy7Z9JX65L5xj90+oOjID/qxMbS45pTzVWEkQWeacMY58jZRoxPFkZR 4/prehvCQQpkWGk+5YR6iGVTp9otdeZ8eabAX6SB0OEj5ObWLqBexh74KKix6deI UaJBEw+MnTQM64eW7YvzIhGyTmVZ9lG2PAkXmUFvKvRkkVL6ne3tHtSVOaqOzJCu Hycy4HM1oPY6OksTWQxPGPEL60Dbe/Ubn5yxUmaA+Kp/ukRPs7agCz1zvytw/yzh N+JZuqg7md+Ds3hamai/NPkck/NArdf95eQQSu7JtyB9ZvBMRo2/nH8cLPcD9FNj cTY9UM/LwRH7qpuexoVARSpGSIywDyDI+W09M4BRN6KK02x6bBxdPHp4VaypO/Ra iNZmWKvcMwc6wjqJWwiO//IshgHYF3P3UZJVM6h7QzEupsWnaMx2QhsShiZQdmOz 4D1x1917l68dGV2tyItlaK5Wggn21BB5jak6buiHgIGQwAHAh34zQeyij1zqig6n QBxSA+6XUtSEQsXKStvW7UftOERgU9Y5LqK6zvkNokCreyxpZMw= =NrVe -----END PGP SIGNATURE----- --xFAmhKQubiDuYx90--