From nobody Tue Oct 18 15:19:38 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MsHbH1pbQz4g2Zt; Tue, 18 Oct 2022 15:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MsHbH1G4tz3RnN; Tue, 18 Oct 2022 15:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666106379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JopQumJcuqf8mMDqb2G/5ugq/IP25DI61PkjUShjeBw=; b=GZlHzc+VCg9lmiZYPRyNEfVF4qmByPBqRf0st+qcw6yR469h5qbRKto8h00KtnATrZihzo TDbIhli/bKEp6IQrCNjHpF7tLTMU+xfzsoLpZXh44ObH0RV7BmANZsiDh1MQrU67HTAqz/ tXNnymIrn2pZ3rjKP8HrdZ+evM4RoIQsilr77BbyxcOXVCyA1FtIComg+aEfiWRLtvZnug QBTeoxoziaU77J4saQ+QCQmvRqOXylloj9/MTWW05KGOYLYXLT43tsYEgTs+M3nkxAe7dr 2ctWmaljp3IxsJDsFXYZyiKIXrj0LG429mhr23xGCLbbvlNU5SljzyOa/LER8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MsHbH0KJHz1CKl; Tue, 18 Oct 2022 15:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29IFJc8a080891; Tue, 18 Oct 2022 15:19:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29IFJch8080890; Tue, 18 Oct 2022 15:19:38 GMT (envelope-from git) Date: Tue, 18 Oct 2022 15:19:38 GMT Message-Id: <202210181519.29IFJch8080890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5be5d0d5cb26 - main - geom_part: Check number of GPT entries and size of GPT entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5be5d0d5cb2657d7668f4ca0f8543198cf8d759b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666106379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JopQumJcuqf8mMDqb2G/5ugq/IP25DI61PkjUShjeBw=; b=RiLUup6r6fkcbKylRNBMNaRAFl1CTbNk7um+GjSWNcwEwP/OKAdGvRRlA5r4hawULQuzx7 FNRRxaKcbOZ1VburMEOPZYAew5e0eGkTMtCUY0XQ+kmcYwzBrp7o29kPcseOHVWMpKdqDM PqMhb169FE9AtzY8wJ2qvx6a7KCTgOb1VT2bnTU0A1Rduq8gQgg0Qyz+PBChh+rT0sfbfw yPWfpdThq8iai107iJ/tfL5SbmazhzksbSaTwdMHr4HPTOv/5CxhuAt49YACKXHCIkJMst JW4+wbAO6oJy4qSJ66EunLHMcOPvFJI42r6AIWidCUxBIr5E4zOUKYeuCWcW6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666106379; a=rsa-sha256; cv=none; b=UzFdwTZmc6qwVcPJwX/gcwsOHR9YbJKq88MLWXNujEdnap3fBf8l2e2FxbA3aq1dleTtub 5JnQkhSyZXGKpDklQB7HA8xhXNYh+8jJxwx/VIbcX1SoJN47Sy4QTQbMrC9k6fPZ7kckyl CIkvzTVxdd1slcUduwCWYh08Sik0WzcXf2+CN4mv0ElcMJlq5NdQGgC8SV2UeoyPIy5YTf dGajHR3MSrT4yXcqbi7MuhTj2C8W5lIEOL43LAdXxgGGgIMzw2aIIv4MouxJeZq1bqPGAE /cHCMA9bVZgHskuHdJLJADyNFLhufTHPYtgwUnLVQ/w21IqDJggByAqnnMV2zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5be5d0d5cb2657d7668f4ca0f8543198cf8d759b commit 5be5d0d5cb2657d7668f4ca0f8543198cf8d759b Author: Zhenlei Huang AuthorDate: 2022-10-18 15:03:02 +0000 Commit: Mark Johnston CommitDate: 2022-10-18 15:03:02 +0000 geom_part: Check number of GPT entries and size of GPT entry Current specification does not have upper limit of the number of partition entries and the size of partition entry. In 799eac8c3df597179bbb3b078362f3ff03993a1a Andrey V. Elsukov introduced a limit maximum number of GPT entries to 4k, but that is for write routine (gpart create) only. When attaching disks that have large number of GPT entries exceeding the limit, or disks with large size of partition entry, it is still possible to exhaust kernel memory. 1. Reuse the limit of the maximum number of partition entries. 2. Limit the maximum size of GPT entry to 1k. In current specification (2.10) the size of GPT entry is 128 * 2^n while n >= 0, and the size - 128 is reserved. 1k should be sufficient enough for foreseen future. PR: 266548 Discussed with: imp Reviewed by: markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D36717 --- sys/geom/part/g_part_gpt.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 0c472e5ebba6..cd04fe714fbe 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -85,6 +85,7 @@ enum gpt_state { GPT_STATE_MISSING, /* No signature found. */ GPT_STATE_CORRUPT, /* Checksum mismatch. */ GPT_STATE_INVALID, /* Nonconformant/invalid. */ + GPT_STATE_UNSUPPORTED, /* Not supported. */ GPT_STATE_OK /* Perfectly fine. */ }; @@ -148,6 +149,8 @@ static kobj_method_t g_part_gpt_methods[] = { { 0, 0 } }; +#define MAXENTSIZE 1024 + static struct g_part_scheme g_part_gpt_scheme = { "GPT", g_part_gpt_methods, @@ -548,6 +551,11 @@ gpt_read_tbl(struct g_part_gpt_table *table, struct g_consumer *cp, if (hdr == NULL) return (NULL); + if (hdr->hdr_entries > g_part_gpt_scheme.gps_maxent || + hdr->hdr_entsz > MAXENTSIZE) { + table->state[elt] = GPT_STATE_UNSUPPORTED; + return (NULL); + } pp = cp->provider; table->lba[elt] = hdr->hdr_lba_table; @@ -961,10 +969,25 @@ g_part_gpt_read(struct g_part_table *basetable, struct g_consumer *cp) /* Fail if we haven't got any good tables at all. */ if (table->state[GPT_ELT_PRITBL] != GPT_STATE_OK && table->state[GPT_ELT_SECTBL] != GPT_STATE_OK) { - printf("GEOM: %s: corrupt or invalid GPT detected.\n", - pp->name); - printf("GEOM: %s: GPT rejected -- may not be recoverable.\n", - pp->name); + if (table->state[GPT_ELT_PRITBL] == GPT_STATE_UNSUPPORTED && + table->state[GPT_ELT_SECTBL] == GPT_STATE_UNSUPPORTED && + gpt_matched_hdrs(prihdr, sechdr)) { + printf("GEOM: %s: unsupported GPT detected.\n", + pp->name); + printf( + "GEOM: %s: number of GPT entries: %u, entry size: %uB.\n", + pp->name, prihdr->hdr_entries, prihdr->hdr_entsz); + printf( + "GEOM: %s: maximum supported number of GPT entries: %u, entry size: %uB.\n", + pp->name, g_part_gpt_scheme.gps_maxent, MAXENTSIZE); + printf("GEOM: %s: GPT rejected.\n", pp->name); + } else { + printf("GEOM: %s: corrupt or invalid GPT detected.\n", + pp->name); + printf( + "GEOM: %s: GPT rejected -- may not be recoverable.\n", + pp->name); + } if (prihdr != NULL) g_free(prihdr); if (pritbl != NULL)