From nobody Fri May 19 23:54:25 2023 X-Original-To: dev-commits-src-branches@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 4QNNwy2sVYz4CX8v; Fri, 19 May 2023 23:54:26 +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 4QNNwx6S6Wz3vm2; Fri, 19 May 2023 23:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540465; 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=9WLbC/RNSSZPfHqx2Wg1jHd2Ui8h5PeGpc2g68UCO3o=; b=DjoAy54CmcYNPmrWWtIhMwsq/HtLxyQZ9U+oIpPK6ERD9NMfGalR3XRbFKFSpSHQrbDRWz EAGq934gqiW1UMrXFeAe0wZIejn79k9pgBRBmE6yGBiS88Hem4LfrPiiYpKfiA0e9oYME7 ETO+2DfRt7mW9yk1y/QjY4H2Z892PyIa9yobN/tVfylXWoDmOfaEAoXyq44WSRg4I3VyG8 aBiY3lEuExD6l1ICdHDFsZQ9jeds8DOUeakyk8B1X41GxPQqaOH7s2qdHgJmeOdNHjdarr t2D4DKC9H+cWTug3RREOEx3fMV/nt62V4JSazWJU79SEeb1AwoWZzlKky+Oe7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540465; 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=9WLbC/RNSSZPfHqx2Wg1jHd2Ui8h5PeGpc2g68UCO3o=; b=Iiomk+U0StM8TV32+iJOcGXq+OFNIQUcN/+NNem2XqFRo0Td/YoSu8CxoRqqvUPOSfZYNl adh9Lc3Pqzx7fA/aNthzFUikYnmdocCMU3rj57X2k0IAjUeV1GkpXnPGsN1ccTXLcOe8pD Ddojlsd2lBgiFWkChz+JBkpw+wG5PF0SzUUvv5klYmd0AZFsTFsM/l3vjtBgLbCw96uOyD cU6XrWtQfAIJJOvqQ2nU671xeKWdOAACFdnQoknAVhK+aLeng513uKPMGmVxyLhMFIKIzk fJW7t6ycqJYF2/LnFXhWvxIpsG0LPfMzgCo3Ay6jrQS5U0IQhfxf5CtovXlE0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684540465; a=rsa-sha256; cv=none; b=joS5MyUSBvQ7wgmNhFjZFIBAU8YF3hJUKMGBxWCQIyXnm//B4C2cUUnjgPI/4IcZxLIfWU KXaJgXnD7fZJOgj2DrbDiRDEg+Z+wFHydvRDfYhlcUnJmUhLTuWe7K2lyZjgPBzf3F0/ah FDGH7z0aP/UXE2zA88+xXByQ16DydGiwkXuV6sOqb8jMj+YG+i6R6DH0FkU4hT8yd5gg3P 9PaylBgSzODGp0YwboLKCZ16LEt6Iw+F5vtOy70ecr8/qVjglNrmYPciIkWneVPp+uhxRx ApjDObzBVZ3iqeR+C2m9E9neBHGBlGdjMwM5xFG8rIxW5qCJJ2EtD6WTcr7SQQ== 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 4QNNwx5Z9JznCh; Fri, 19 May 2023 23:54:25 +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 34JNsPhi064808; Fri, 19 May 2023 23:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JNsPHd064807; Fri, 19 May 2023 23:54:25 GMT (envelope-from git) Date: Fri, 19 May 2023 23:54:25 GMT Message-Id: <202305192354.34JNsPHd064807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: eefbecaab1b1 - stable/13 - Updates to UFS/FFS superblock integrity checks when reading a superblock. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eefbecaab1b10c5a587bf1292e585ef480f81d71 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=eefbecaab1b10c5a587bf1292e585ef480f81d71 commit eefbecaab1b10c5a587bf1292e585ef480f81d71 Author: Kirk McKusick AuthorDate: 2023-04-29 18:52:27 +0000 Commit: Kirk McKusick CommitDate: 2023-05-19 22:51:27 +0000 Updates to UFS/FFS superblock integrity checks when reading a superblock. (cherry picked from commit a2d1957bbcc87b499526df8d99ec7e1ddd2193c0) --- sys/ufs/ffs/ffs_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index d847373a8cde..1bd298315dd9 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -432,6 +432,9 @@ validate_sblock(struct fs *fs, int isaltsblk) %jd); CHK(fs->fs_sbsize, >, SBLOCKSIZE, %jd); CHK(fs->fs_sbsize, <, (unsigned)sizeof(struct fs), %jd); + /* fix for misconfigured filesystems */ + if (fs->fs_maxbsize == 0) + fs->fs_maxbsize = fs->fs_bsize; CHK(fs->fs_maxbsize, <, fs->fs_bsize, %jd); CHK(powerof2(fs->fs_maxbsize), ==, 0, %jd); CHK(fs->fs_maxbsize, >, FS_MAXCONTIG * fs->fs_bsize, %jd);