Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1k1F2w-0000XF-3D for mharc-grub-devel@gnu.org; Thu, 30 Jul 2020 16:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1F2t-0000Wi-LF for grub-devel@gnu.org; Thu, 30 Jul 2020 16:20:55 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:55375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1F2r-0002vG-Hz for grub-devel@gnu.org; Thu, 30 Jul 2020 16:20:55 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 73CF65C018F; Thu, 30 Jul 2020 16:20:51 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 30 Jul 2020 16:20:51 -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=fm1; bh=2VRlPi7z7O7enXFJZlhlddo3Sb+ jrsDbtkuz4zdgieI=; b=SD/dT3C3XEmj37UoNgCTLA1PFp8IMp6ovrbQKCFhmbX U5gzSrSU6XN0OdXuBlJ99821LE5b6KoXV2LhyWfxn40sj+wEEWDwwIboyqXHMedF ChZis/5l807F7ybnHsFQ07CpDrxC9CNngADYKqpEvsL6BKvL8W+yeb8EgN16DBV5 g/C3cbW+1Pig+EAd8GRHvrS/cK0g5O6CVZHtbs6MRN0NCqZL/RYbnoQGFkfuGmYG KKbFXi24IzR5JqyapPVLggjIQloV6pbHsN4nD9hr4XfEDIBe9cZVhCH6wOKmusPj 9PaHX5zm7tZO17oaZQlJ3vNjtfnwcYkDdxVKgqQbb3w== 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=fm3; bh=2VRlPi 7z7O7enXFJZlhlddo3Sb+jrsDbtkuz4zdgieI=; b=GlIxTmvZi9g0EGgts/YVIE QotQiiXd60Ely5tvZNlWJoh5EDJ9W5RX91zab2qcYNfQoYbHiwz0eyu3zU1RRHVO toWm/mjw7B/Y2ubcJwieXurFdvP+1rE6QEdp6kQYbaSN4B/N/ZUwNUST34dfYJot iLX/XaXLr58ej5FjVAOCpu3qq29d1sR7PyV4Jnuu8aDxSXy2gtZUgtk5cgPvPKcp 7UfiTYxJElhYTbWzsaeVXeP1/6OAVHLlmU+E9byh94ZmgJwx2Ki46+mRgsPMNRif QWHed16RSxR+HEaPXyBw5gb3QCCI6JilB/fMET86VQrLapM6SpVILlVwmzxbfwGw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrieeigddugeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepkeelrddugedrfeefrddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (x590e2100.dyn.telefonica.de [89.14.33.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 930E93280063; Thu, 30 Jul 2020 16:20:50 -0400 (EDT) Received: from localhost (xps [10.192.0.12]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 0e1d6a00 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 30 Jul 2020 20:20:44 +0000 (UTC) Date: Thu, 30 Jul 2020 22:22:41 +0200 From: Patrick Steinhardt To: development@efficientek.com Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH 17/17] luks2: Fix use of incorrect index and some error messages. Message-ID: <20200730202241.GA1169@xps.pks.im> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="y0ulUmNC+osPPQO6" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=66.111.4.28; envelope-from=ps@pks.im; helo=out4-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/30 16:20:51 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Thu, 30 Jul 2020 20:20:56 -0000 --y0ulUmNC+osPPQO6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 29, 2020 at 04:50:22PM -0500, development@efficientek.com wrote: > From: Glenn Washburn >=20 > Signed-off-by: Glenn Washburn > --- > grub-core/disk/luks2.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index 44a73d2b8..48600db68 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -277,34 +277,34 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_lu= ks2_digest_t *d, grub_luks2_s > return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get digests"); > for (j =3D 0; j < size; j++) > { > - if (grub_json_getchild (&digest, &digests, i) || > + if (grub_json_getchild (&digest, &digests, j) || > 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); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRI= uGRUB_SIZE, j); > =20 > if ((d->keyslots & (1 << idx))) > break; > } > if (j =3D=3D size) > - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot= %"PRIuGRUB_SIZE); > + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot= %"PRIuGRUB_SIZE, i); These look correct to me. > /* Get segment that matches the digest. */ > if (grub_json_getvalue (&segments, root, "segments") || > grub_json_getsize (&size, &segments)) > return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get segments"); > - for (j =3D 0; j < size; j++) > + for (i =3D j, j =3D 0; j < size; j++) Why do we reassign `i =3D j` here? I think it's to fix the "No segment for digest" message below which previously referred to the wrong digest, right? I think we should just stop using `i` and `j` here. If we renamed them `keyslot_index` and `digest_index`, respectively, and only use `i` as a loop variable, then the code would be much easier to read. > { > - if (grub_json_getchild (&segment, &segments, i) || > + if (grub_json_getchild (&segment, &segments, j) || > grub_json_getuint64 (&idx, &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); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PR= IuGRUB_SIZE, j); > =20 > if ((d->segments & (1 << idx))) > break; > } > if (j =3D=3D size) > - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %= "PRIuGRUB_SIZE); > + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %= "PRIuGRUB_SIZE, i); > =20 > return GRUB_ERR_NONE; > } > --=20 > 2.25.1 >=20 --y0ulUmNC+osPPQO6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl8jLBAACgkQVbJhu7ck PpQ6lw/8CcIxjXSrSuapgehR1zD+wv3pScNlRRWy6FYLyTX3xU+59W4JwYZ24PUl ZTeJYTWboKnpaT5bimKpSddVO65JVE4h0o98+6FU3MxJRItdEFaGxVTTvTfNHu0Q 2D1JADbOrgsftT940INRCAIblAVVd/+e8D9sR8wZMgpXHboN75TP8eZRGGAd+uEp VlLRR2S7m0A759n9KGPgtCAdwZo6M+JJmL/ovBGv8ewNs9JFi7UT/7bSrAtuR0VI MUJ3i7DJDdyHYmLpYpM41lkuMQpQUgrneHIqmu7g0jy8oL+c62kSymK6zkl6GtXA cfSKmwyMqmgAMFfPHU9nguqsQlR69AO+KGUotZnVn9uPM/KludIffwKOwbjZAZIS PUyjTyhcdVb3wFGAO/0+Z6hcs5rMCsRU4El8kvz58I09gm7vEFnaqn0yMo3Mn3XF Zp7x/gyrsQtAZXo39MqCe982FUUwm340GdsVxbK+HaA9gTF1NHDB/w8bx7pbO7X0 YCUGyb1OVzYM0z9vw2RQ4Flf2AJnea9t4ceMfP3K4dFE2iCubWNbxqxbmgJavtsb zSxpjok/Cy8NLpcMPjvTvIl0CGR6gyqiFfa5Lnaqg1Y+C2KnUpT+W6mUPEw5J4cI FuXz+euRVBFqJQbVv3T8Chsd/zLCoTkRQ84yBrNWb/LBQ0w9s+I= =cfww -----END PGP SIGNATURE----- --y0ulUmNC+osPPQO6--