From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 02 Jun 2021 11:19:12 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1loN1s-0000J8-Or for lore@lore.pengutronix.de; Wed, 02 Jun 2021 11:19:12 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1loN1o-00037b-9f for lore@pengutronix.de; Wed, 02 Jun 2021 11:19:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1Tqdc17Vn364AMyi+cDDK0fCz1VACgzeAww6c0R3KSQ=; b=EECuAKCNByPvH1x94zziZjWknv RaNAojFRYDYKubkpG0GkzBqi7xzUlP/3QVZsc7yBOqIhHg9xsTes4Ikr31XXmvAhS273PV4c5CZJV bZMFfmii7Wvx9oOZwr9rx18dSZ4pSYEX1WjNBpi3sQtBpjFSYprlj+hCdyGi+J6Il3btNjcEfcbVX IAUVHFI+cqtZXh6Xyij99bpjP+KJ/6I64msPuPujJXsNIvYvB3IC+i2LtuGBtN3LRbKHz4mCpDf5n vqmQQGZtPs0g4v+1sun1hMnOIncz3KhM+0rLIzivWOLF+bfDlIIRrly1/GwNa0Oxj8iwa+khr5UFB LEnV/pTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loN04-002vg6-7S; Wed, 02 Jun 2021 09:17:20 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loMzw-002ven-LH for barebox@lists.infradead.org; Wed, 02 Jun 2021 09:17:16 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1loMzt-0002ze-A8; Wed, 02 Jun 2021 11:17:09 +0200 To: Sascha Hauer , Barebox List References: <20210602071533.10093-1-s.hauer@pengutronix.de> <20210602071533.10093-2-s.hauer@pengutronix.de> From: Ahmad Fatoum Message-ID: <49735235-eb7b-00e4-7f5a-41ec5c3a1080@pengutronix.de> Date: Wed, 2 Jun 2021 11:17:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210602071533.10093-2-s.hauer@pengutronix.de> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210602_021712_736068_262EE9B0 X-CRM114-Status: GOOD ( 23.06 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 2/2] partitions: efi: Fix MAX_PARTITION check X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On 02.06.21 09:15, Sascha Hauer wrote: > The GPT partiton parser has a check which should check if the GPT has > more partitions than we support. This doesn't work because the loop > iterating over the partitions exits with a maximum i of MAX_PARTITION, > i > MAX_PARTITION will never be true. Fix the check. > > Signed-off-by: Sascha Hauer Reviewed-by: Ahmad Fatoum > --- > common/partitions/efi.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/common/partitions/efi.c b/common/partitions/efi.c > index 437c3d64f8..135b08901a 100644 > --- a/common/partitions/efi.c > +++ b/common/partitions/efi.c > @@ -446,7 +446,14 @@ static void efi_partition(void *buf, struct block_device *blk, > } > > nb_part = le32_to_cpu(gpt->num_partition_entries); > - for (i = 0; i < MAX_PARTITION && i < nb_part; i++) { > + > + if (nb_part > MAX_PARTITION) { > + dev_warn(blk->dev, "GPT has more partitions than we support (%d) > max partition number (%d)\n", > + nb_part, MAX_PARTITION); > + nb_part = MAX_PARTITION; > + } > + > + for (i = 0; i < nb_part; i++) { > if (!is_pte_valid(&ptes[i], last_lba(blk))) { > dev_dbg(blk->dev, "Invalid pte %d\n", i); > return; > @@ -460,10 +467,6 @@ static void efi_partition(void *buf, struct block_device *blk, > snprintf(pentry->partuuid, sizeof(pentry->partuuid), "%pUl", &ptes[i].unique_partition_guid); > pd->used_entries++; > } > - > - if (i > MAX_PARTITION) > - dev_warn(blk->dev, "num_partition_entries (%d) > max partition number (%d)\n", > - nb_part, MAX_PARTITION); > } > > static struct partition_parser efi_partition_parser = { > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox