From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kA5zi-00031V-KD for mharc-grub-devel@gnu.org; Mon, 24 Aug 2020 02:30:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kA5zh-00031N-O1 for grub-devel@gnu.org; Mon, 24 Aug 2020 02:30:13 -0400 Received: from mail-io1-xd42.google.com ([2607:f8b0:4864:20::d42]:38839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kA5zf-0006zJ-Ux for grub-devel@gnu.org; Mon, 24 Aug 2020 02:30:13 -0400 Received: by mail-io1-xd42.google.com with SMTP id h4so7517930ioe.5 for ; Sun, 23 Aug 2020 23:30:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=rlSryNnX5YDMGN2T/J3k0ktAzlr/+W5v4QMHjULYrQc=; b=dANQbU2If1PfziufIlHtfBPfey5kSQEflkmPHk1+kxhGOZx++QzKF2zR2jV+IiPDgP fj70/2SLiyw4ethKb6IYnqsw8y4cNOtrFeexaAtR8+9V35xQ5v1nQkW35OA5ts9RF5zG 9T2slJR0iyn/NH7q4YY3iXx5CtTBzd8IC0eAIgiLgKxYB5w1Ma3Lv8DyOzaPike1wdyT /hgQjxP5Bx+lkoL5HN52DpVPp6i7tAypKMFZMVFtVkHEavmcI8Aj5bn/4sYCQ5elRWPj l+S/LMjxYOEFXag6shedgsL6Wf2ycal4z/sCWYsUb42RUdlgERyk98UpzLWRXG/q6AwJ lyxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=rlSryNnX5YDMGN2T/J3k0ktAzlr/+W5v4QMHjULYrQc=; b=GY97veKNhecTAhPBis/hiLyfqYLmBCOvdE6GaE3njFO+0n74ORuvv+dlAoHmlnfbxO /jjlxa9dwu2JXnCeYf1CFwgaqcBmEXjXyZ6IFSPHT1LF5rC7pjCf3G2nNh8xJGI9MOY9 mkKc8k/pwAxzyEkXsUY+zTolIMChS5VdjpG5BYrdO3ADhkJHIyHAcs/Eszl9w0XCoCpF MWxat2jDG/QxUDcDr6so571TSjnS8wEtt8mEAozHrq4ig9y/Mf4+8m7WGmVRI9zvRfsq 9r64DTqSinpF9oUOxH5ncZACGee1gE9w/stmQ2sjEWjvWvHGWM23DU+29QFmuY6n8/fR PMVw== X-Gm-Message-State: AOAM530g6PNOs0grFumyBFv5lXqc6LUTbjTdW26oMhjFiyj5oT7bS+AP yEC9qdiC1ZFaNqTRwXFeyxNFiw== X-Google-Smtp-Source: ABdhPJxP2dmK1Mxd90C5tPxMgSJCX0W++QzPzYS2aENx91h+Hc9o4wqQwKc1n5GBb0jc1Kgkt/XC1g== X-Received: by 2002:a02:c502:: with SMTP id s2mr4273689jam.122.1598250610645; Sun, 23 Aug 2020 23:30:10 -0700 (PDT) Received: from crass-HP-ZBook-15-G2 ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id j10sm6728667ili.86.2020.08.23.23.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 23:30:10 -0700 (PDT) Date: Mon, 24 Aug 2020 01:30:05 -0500 From: Glenn Washburn To: Patrick Steinhardt Cc: The development of GNU GRUB , Denis 'GNUtoo' Carikli , Daniel Kiper Subject: Re: [PATCH 3/9] luks2: Fix use of incorrect index and some error messages Message-ID: <20200824013005.42744105@crass-HP-ZBook-15-G2> In-Reply-To: <7cf9d9526dbbc1df2ef2fc10062642d3689a1a54.1598179677.git.ps@pks.im> References: <7cf9d9526dbbc1df2ef2fc10062642d3689a1a54.1598179677.git.ps@pks.im> Reply-To: development@efficientek.com X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2607:f8b0:4864:20::d42; envelope-from=development@efficientek.com; helo=mail-io1-xd42.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: Mon, 24 Aug 2020 06:30:13 -0000 Was it intentional to include the old/original version of this patch which you requested to be changed to make it more readable? There is an updated patch with subject "[CRYPTO-LUKS v1 18/19] luks2: Fix use of incorrect index and some error messages.". Glenn On Sun, 23 Aug 2020 13:03:07 +0200 Patrick Steinhardt wrote: > From: Glenn Washburn > > Signed-off-by: Glenn Washburn > Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index e3ff7c83d..200f81d3a 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -275,34 +275,34 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, > grub_luks2_digest_t *d, grub_luks2_s return grub_error > (GRUB_ERR_BAD_ARGUMENT, "Could not get digests"); for (j = 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 %"PRIuGRUB_SIZE, i); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse > digest %"PRIuGRUB_SIZE, j); > if ((d->keyslots & (1 << idx))) > break; > } > if (j == 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); > /* 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 = 0; j < size; j++) > + for (i = j, j = 0; j < size; j++) > { > - 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 %"PRIuGRUB_SIZE, i); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse > segment %"PRIuGRUB_SIZE, j); > if ((d->segments & (1 << idx))) > break; > } > if (j == 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); > return GRUB_ERR_NONE; > }