From nobody Wed Nov 9 17:21:42 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 4N6sFz1sPWz4dRvx; Wed, 9 Nov 2022 17:21:43 +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 4N6sFz1LYzz3GXn; Wed, 9 Nov 2022 17:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668014503; 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=Zzdqm7BJWcWLAH8M5ukjnckUIr59ZB/Whc7Zqk3DOvc=; b=sf0F2WqWPJKICcQ3Xy78gYhP7BNMGqOtjckAuNAVskFsvRPYa7TnMcxdYmm6oicMd8MUMK Zd6bZjj/gwOK1TrsPnAq08s7oq6ms4CSdYh3COARx9OayGx8dP1HsNW+hBF+B4uaZRNHvR 1wtKS/uV4d7D3BBKuEjd78YhB10mOLYiADw9ICjqhO9/v0UfA+J5xPXJQEYA12ZzOuc3tc LI11ywnqePOxOKft5IZRCEDKqLXBgXcEmuw4hcioyP9Xwce84WW75tROKVGUb8sGJHnVUk lrU8YlqpzjqdbOFMZ5EyAzI508gc5lMfvkTWYZmh3OSJX2EEj2eNrgL1gy7D2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668014503; 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=Zzdqm7BJWcWLAH8M5ukjnckUIr59ZB/Whc7Zqk3DOvc=; b=OCPsuZ7ohYDbItEXGMfaUQh22AqZrL02EZqLFzOvkwhxHC6O130qR3LW4AZzHLAuyfK0Wj 8wF59cms04LO7e2Dup9ACqb7282A3N2B3tda5cUpVvZCacWpPCOlOwjwkYSM8tViG7xQAY 36VWrosNzOlfozb3oLZhD7kNB/Tx8DixxqMpdYePAL9YksKi/Ypnhk09/iGf6s9bfNv65l 1VssGe17m4pgkOM7xrZsh3eEAOYHXzJaw/bhQFAlX1dq3xxpcCeE4RdGnwVfYJTbHtkGrn bXYKp77hNTRcZqs/Rmg6Ox92HrrBhA84t9m0JpDdBHAlIeQuFsRNplIqSPR9QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668014503; a=rsa-sha256; cv=none; b=MNSQfkGe7qMBaur1U+kF5Wc3xZzqiZ5Eqm246lTvnv5D4WXiHAnGelKtwkc7RAxBMJ4wHR U2uSla/Sztyr9By1XXi4Zi1EjDIz2BlE+pQT/dreN++KwXE45/XedhPBnoluvZQTXIcbXw kZMF7fjBeB5AcEdotdAx7fidujgBHgCfgzVq7IQa8oCv7w4kNtuG/H89k6I1T9qFNDdah8 MhyeihhnR1NjPHelwLRz2gfNzYqkNY8H/9ARAohSfgqI8y4jrpzoFcQq1vNUC/N+5OAv+B yxJZNlVAI56UrBzZ9QPzDrvf8EiEX5ShdKZfP20OJESlt5zbAgBsfI9UHjxUCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6sFz0PDkzV5r; Wed, 9 Nov 2022 17:21:43 +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 2A9HLgJj095199; Wed, 9 Nov 2022 17:21:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9HLgKu095198; Wed, 9 Nov 2022 17:21:42 GMT (envelope-from git) Date: Wed, 9 Nov 2022 17:21:42 GMT Message-Id: <202211091721.2A9HLgKu095198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 05d0f4308caa - main - Don't panic when tasting a disk with sectorsize=0 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05d0f4308caaa3e9b8cbcbb30b2d7f39dd367a57 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=05d0f4308caaa3e9b8cbcbb30b2d7f39dd367a57 commit 05d0f4308caaa3e9b8cbcbb30b2d7f39dd367a57 Author: Alan Somers AuthorDate: 2022-11-09 02:59:50 +0000 Commit: Alan Somers CommitDate: 2022-11-09 17:21:12 +0000 Don't panic when tasting a disk with sectorsize=0 This can sometimes happen with broken HDDs. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D37313 --- sys/geom/label/g_label.c | 4 ++++ sys/geom/label/g_label_ext2fs.c | 5 +++-- sys/geom/label/g_label_iso9660.c | 5 +++-- sys/geom/label/g_label_reiserfs.c | 5 +++-- sys/geom/label/g_label_ufs.c | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c index 2244931cd19b..8f6ac38179a6 100644 --- a/sys/geom/label/g_label.c +++ b/sys/geom/label/g_label.c @@ -394,6 +394,10 @@ g_label_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) if (pp->acw > 0) return (NULL); + /* Skip broken disks that don't set their sector size */ + if (pp->sectorsize == 0) + return (NULL); + if (strcmp(pp->geom->class->name, mp->name) == 0) return (NULL); diff --git a/sys/geom/label/g_label_ext2fs.c b/sys/geom/label/g_label_ext2fs.c index 3420efb7ca3a..0f21de1ce313 100644 --- a/sys/geom/label/g_label_ext2fs.c +++ b/sys/geom/label/g_label_ext2fs.c @@ -62,10 +62,11 @@ g_label_ext2fs_taste(struct g_consumer *cp, char *label, size_t size) pp = cp->provider; label[0] = '\0'; - if ((EXT2FS_SB_OFFSET % pp->sectorsize) != 0) - return; + KASSERT(pp->sectorsize != 0, ("Tasting a disk with 0 sectorsize")); if (pp->sectorsize < sizeof(*fs)) return; + if ((EXT2FS_SB_OFFSET % pp->sectorsize) != 0) + return; fs = g_read_data(cp, EXT2FS_SB_OFFSET, pp->sectorsize, NULL); if (fs == NULL) diff --git a/sys/geom/label/g_label_iso9660.c b/sys/geom/label/g_label_iso9660.c index b46a47bbd36a..1ac7283b34e6 100644 --- a/sys/geom/label/g_label_iso9660.c +++ b/sys/geom/label/g_label_iso9660.c @@ -52,10 +52,11 @@ g_label_iso9660_taste(struct g_consumer *cp, char *label, size_t size) pp = cp->provider; label[0] = '\0'; - if ((ISO9660_OFFSET % pp->sectorsize) != 0) - return; + KASSERT(pp->sectorsize != 0, ("Tasting a disk with 0 sectorsize")); if (pp->sectorsize < 0x28 + VOLUME_LEN) return; + if ((ISO9660_OFFSET % pp->sectorsize) != 0) + return; sector = g_read_data(cp, ISO9660_OFFSET, pp->sectorsize, NULL); if (sector == NULL) return; diff --git a/sys/geom/label/g_label_reiserfs.c b/sys/geom/label/g_label_reiserfs.c index d6f9a0428b6a..8fe1a72458e4 100644 --- a/sys/geom/label/g_label_reiserfs.c +++ b/sys/geom/label/g_label_reiserfs.c @@ -59,10 +59,11 @@ g_label_reiserfs_read_super(struct g_consumer *cp, off_t offset) secsize = cp->provider->sectorsize; - if ((offset % secsize) != 0) - return (NULL); + KASSERT(secsize != 0, ("Tasting a disk with 0 sectorsize")); if (secsize < sizeof(*fs)) return (NULL); + if ((offset % secsize) != 0) + return (NULL); fs = g_read_data(cp, offset, secsize, NULL); if (fs == NULL) diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c index 691f875cf6cc..9f22427666e9 100644 --- a/sys/geom/label/g_label_ufs.c +++ b/sys/geom/label/g_label_ufs.c @@ -139,6 +139,7 @@ g_label_ufs_taste_common(struct g_consumer *cp, char *label, size_t size, int wh label[0] = '\0'; fs = NULL; + KASSERT(pp->sectorsize != 0, ("Tasting a disk with 0 sectorsize")); if (SBLOCKSIZE % pp->sectorsize != 0 || ffs_sbget(cp, &fs, UFS_STDSB, UFS_NOHASHFAIL | UFS_NOCSUM | UFS_NOMSG, M_GEOM, g_use_g_read_data) != 0) {