From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1keEeL-0003Fk-VR for mharc-grub-devel@gnu.org; Sun, 15 Nov 2020 04:48:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keEeK-0003FN-NO for grub-devel@gnu.org; Sun, 15 Nov 2020 04:48:44 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:59301) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keEeJ-0003ia-0m for grub-devel@gnu.org; Sun, 15 Nov 2020 04:48:44 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 8BB445C00EA; Sun, 15 Nov 2020 04:48:42 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 15 Nov 2020 04:48:42 -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=hCjV0YSwMlA6/pDKq3lrMteevId bMejpYUu+q8EHiKk=; b=kkLf1BGR2oCHSVcJ0nqFrHQCAQs4KA2hf43ST9Ywn2t Wrv4haVGcezMiFXRpBWEWZh0La0etb/cFHqPZM10kLsuw/YcakNTyQpyBnyncbnk HGpC5ZMWx8Mypb0aWjHXqV+619vj5rPuKudKE+fpHfMh2wMaTJ9q6hdQALhuJtcf 1vJH9DnD877ejEjJxfNu8LjYkefc/DPIhfRWd8/IjBlyhNM9cotuqUyQM4ZDkH68 Q/403CpZPYjdfI/z3b4+6dIePmYrFOJWi/afkNaNfTysmprobDuiJhL9lhgH3vpV E5rLUUqp0TC/DHVsSbWdBkickeaySbSjpne3WAOfWMw== 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=hCjV0Y SwMlA6/pDKq3lrMteevIdbMejpYUu+q8EHiKk=; b=Z/kyc2u49ObNQZ4qi0Ik3K MAWzaik6yptD2SDT9jvsDRh3JjSgqW2aVcOfj4URwMW9/d7Huwew/Ij2MpRZcFsi 4jWapZ8uGlL8EYzDJL1DaDOnbk02vtefGXxcAURKR1p9XAsCCgKPodVyRhpqiAZn 5b0AUEXIyvATcW5SRMDD02RYN7qaD1NXMOSUkHYFLOviO+bh5YSJco0jWoflCSVp BKCx+wxAeueFrXcgY1L1NcEbkHYMaO7TZi+UhM4EdHED/hMgcGfEWKsxjFVLK0je icYCjzYmUOHtMXDQCDgnNaNpUR9r7SignsA8RD0BpV4baR2iUlocsCekJUlZx1FA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvledgtdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeekrdehgedrvddurddvtdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-054-021-206.78.54.pool.telefonica.de [78.54.21.206]) by mail.messagingengine.com (Postfix) with ESMTPA id 770573280064; Sun, 15 Nov 2020 04:48:41 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id f3bfbfc8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 15 Nov 2020 09:48:38 +0000 (UTC) Date: Sun, 15 Nov 2020 10:48:37 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v4 08/15] luks2: Split idx into three variables: keyslot_key, digest_key, segment_key. Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8/NNO+v6mL+tzxoh" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=66.111.4.27; envelope-from=ps@pks.im; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/15 04:37:28 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: Sun, 15 Nov 2020 09:48:45 -0000 --8/NNO+v6mL+tzxoh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 06, 2020 at 10:44:28PM -0600, Glenn Washburn wrote: > Introduce new variables keyslot_key, digest_key, and segment_key which > represent the integer key of the item in the respective associative array > when looping over the array items. This replaces using a generically > named variable named "idx" used for all three values. >=20 > Signed-off-by: Glenn Washburn > --- > grub-core/disk/luks2.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index d96764a02..1a4034f28 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -259,12 +259,12 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_lu= ks2_digest_t *d, grub_luks2_s > { > grub_json_t keyslots, keyslot, digests, digest, segments, segment; > grub_size_t i, size; > - grub_uint64_t idx; > + grub_uint64_t keyslot_key, digest_key, segment_key; > =20 > /* Get nth keyslot */ > if (grub_json_getvalue (&keyslots, root, "keyslots") || > grub_json_getchild (&keyslot, &keyslots, keyslot_idx) || > - grub_json_getuint64 (&idx, &keyslot, NULL) || > + grub_json_getuint64 (&keyslot_key, &keyslot, NULL) || > grub_json_getchild (&keyslot, &keyslot, 0) || > luks2_parse_keyslot (k, &keyslot)) > return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot %= "PRIuGRUB_SIZE, keyslot_idx); > @@ -276,11 +276,12 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_lu= ks2_digest_t *d, grub_luks2_s > for (i =3D 0; i < size; i++) > { > if (grub_json_getchild (&digest, &digests, i) || > + grub_json_getuint64 (&digest_key, &digest, NULL) || > grub_json_getchild (&digest, &digest, 0) || > luks2_parse_digest (d, &digest)) > return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRI= uGRUB_SIZE, i); > =20 > - if ((d->keyslots & (1 << idx))) > + if ((d->keyslots & (1 << keyslot_key))) It's a bit confusing that this commit introduces `digest_key`, which isn't used at all right now. It makes sense considering its being used in the subsequent commit, but it would've helped if this was pointed out in the commit message. Other than that: Reviewed-by: Patrick Steinhardt Patrick > break; > } > if (i =3D=3D size) > @@ -293,12 +294,12 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_lu= ks2_digest_t *d, grub_luks2_s > for (i =3D 0; i < size; i++) > { > if (grub_json_getchild (&segment, &segments, i) || > - grub_json_getuint64 (&idx, &segment, NULL) || > + grub_json_getuint64 (&segment_key, &segment, NULL) || > grub_json_getchild (&segment, &segment, 0) || > luks2_parse_segment (s, &segment)) > return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PR= IuGRUB_SIZE, i); > =20 > - if ((d->segments & (1 << idx))) > + if ((d->segments & (1 << segment_key))) > break; > } > if (i =3D=3D size) > --=20 > 2.27.0 >=20 --8/NNO+v6mL+tzxoh Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+w+XQACgkQVbJhu7ck PpSOLQ//Xr/CGM9CSGlgCDa8LToHtANJe4EvVbWaqgvF7xLx1Mu+vytKUUZPMWLr Ekl7a4u4yy+/33X7SG3p8meovaAfYaKNojCjH2a6rVrtlkd/dZ4/vV/JkY7xN7Jo 9Teodenkm2mUyN997o8jTFnNGrcq1qQWYwQvJirUgyo5pG++oExw0pm/CGrsTnzV cbOiNuBmxYJ3tnALunVbrCq/QYsFZ6Ca0e4SZ+6OpOILJ421dU/0LeOY3VpNCp5v XqVL1rdUbcf/f8BkpmaQnGcAS/rCnMShgwKE1oToDqARKFz69eEOxKZsYuenrbJh UBmUQM2j/KfgLmktw/cAW6v1Isv2CLZZ/z8OdLE3c17CGGVa/oHZfreegf22Q5S3 2DFSYUsUmd0BZHWDH1GDe3OzaxMkm1Ji4Gv8kkE0zhem6d+i4SKPf9rOGwP5w+4I sOJVW21oMA+275Kz9uMGpEumk80sqjmiXiy9u/DZzsV8Qdzg9cS5ZpCyrhh86ybp HtJ9+qInkAvMNJlHi3rRB4mhIySYKUjSsGb0kzHhtgHB8Xwd66nBJMBm8xtrFFM3 ktyRYG/L8Re5F4a1MES2mkmOE5wWAy/OoAwSKVrRQgmMrCREm2bJErF+B2MDqrt7 wTuwO1VmSbZA30YOxi6zk4dDhPM4ZTrRRhHMpzq5dISkGlMaovk= =pf2h -----END PGP SIGNATURE----- --8/NNO+v6mL+tzxoh--