From nobody Sat Jan 08 04:29:28 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 336661931FBA; Sat, 8 Jan 2022 04:29:29 +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 4JW6Yh5y42z3Dkm; Sat, 8 Jan 2022 04:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AAECA18453; Sat, 8 Jan 2022 04:29:28 +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 2084TSwF022170; Sat, 8 Jan 2022 04:29:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2084TS52022169; Sat, 8 Jan 2022 04:29:28 GMT (envelope-from git) Date: Sat, 8 Jan 2022 04:29:28 GMT Message-Id: <202201080429.2084TS52022169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9f4073d44628 - main - geom label msdosfs: sanity check BPB before using it for io request 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f4073d44628bc70dbe67df5163266cbfbe37167 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641616168; 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=YLrtLfsg54pOnvmAj0EaSurPMo6mwsk21f6QjJwHXHI=; b=f9UZPxG5Xlfg0N9Gi2Nr4LIpL2bGLRs1tyq7PvwwnI0ZHA/u62G3i2TQzCQgySjeGpHnog 9e8/GztI6bcti6df00SDMiXS+FV28M3pZnZSX9vW/5pfConxRI1DsqH5hq1YpFY4fkYaXV nHHNrtz+Q7rbVeQ3Qt8NgufjCnTjPFPWFnAu5YKrTGRDOVF6tF6PrIH4LuOWQMOkKA7HeP qPHiitzi0sL3qyN6grb3Fm2tzn7owrPHO3lzsE9F31v2juvs5D6Z+6JxHp/bH/CU3/Nuqt StZuMbfz+KYHZMaRgls8Kv+FcyPKe16m2lMVzRbyBBLCysgP3+0dqug1jOTz0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641616168; a=rsa-sha256; cv=none; b=yxRQCpqpVfs51UG2G+vy4sOS/qMfE1DQ2KsZmkYPRuy/iQt3tCvTu8W7/ulSJnqSKBdVDw w3wo7COlBOcBP3j8zselGPu36Kz567kgNsWf9P/G8PAWBIFYyayYA0CrjsdtT8tJS0AL+b 55gywcS/fuonEt6VX7zlTYljbA4E4jC6shDsU4yfl1B+Pxj1eFXtH3O7PayMRe7TWw+jXk mYEcoiHUwTvVJ81BPgIW82SOHRKKamAL+ZaK5ZV8dRyKCYMa8A3ruGv854hAiTDyf8wU6J UmSgFGyDvH9CK1YqDcYMUaCXHqkYjU6jjdGhtVT7/PrAPzZr1GyuDwVom4HDMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9f4073d44628bc70dbe67df5163266cbfbe37167 commit 9f4073d44628bc70dbe67df5163266cbfbe37167 Author: Konstantin Belousov AuthorDate: 2021-12-30 13:17:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-08 03:41:44 +0000 geom label msdosfs: sanity check BPB before using it for io request It must be greater than zero, and be multiple of the device block size. In collaboration with: pho Reviewed by: markj, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D33721 --- sys/geom/label/g_label_msdosfs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/geom/label/g_label_msdosfs.c b/sys/geom/label/g_label_msdosfs.c index 06d5f2a8e0f0..f138d1eda716 100644 --- a/sys/geom/label/g_label_msdosfs.c +++ b/sys/geom/label/g_label_msdosfs.c @@ -156,6 +156,12 @@ g_label_msdosfs_taste(struct g_consumer *cp, char *label, size_t size) G_LABEL_DEBUG(2, "MSDOSFS: FAT_FirstDataSector=0x%x, FAT_BytesPerSector=%d", fat_FirstDataSector, fat_BytesPerSector); + if (fat_BytesPerSector == 0 || + fat_BytesPerSector % pp->sectorsize != 0) { + G_LABEL_DEBUG(1, "MSDOSFS: %s: corrupted BPB", + pp->name); + goto error; + } for (offset = fat_BytesPerSector * fat_FirstDataSector;; offset += fat_BytesPerSector) {