From nobody Sun Jul 31 14:50:11 2022 X-Original-To: dev-commits-src-main@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 4Lwkgm0gymz4X5Wh; Sun, 31 Jul 2022 14:50:12 +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 4Lwkgm08mPz3q1m; Sun, 31 Jul 2022 14:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659279012; 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=unKtHoJngiHfpoZ742w12AlDgOSXhbUH4x71auzOU3s=; b=EUEqWNnwPi5BIYLJ9KPQmi6O1z4aHoYvxaYZ/A3aGU4+39tA6cJc3SAO/LLl4gcaUAF2XX Otn8raFSPBB9O4tYlmT+8IpIksi7SgfNAAZ5WRNUdbaX82iXNLYYXjo/NynZgBcq+VhlLM 6IGy3H9Hdzp1O9gMvwoLdG+CtG1Zpikyb8pv0ypwIJv/feoCE5mpexBBW0E2HsX0hIaLJJ JSp1ub9KAFC8jQtiqCLNhiHMPakzRPGUXJt3tMiYuWconPQDdGF3LYaZfAw64xLrLFm+JN 7VsMewMB5p0+o3rZv9eO7Ndzy7z9BxMiXqrzx3klGsBs2LV/eP0eSHsEvSfOgA== 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 4Lwkgl68bfzxHX; Sun, 31 Jul 2022 14:50:11 +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 26VEoBoc017490; Sun, 31 Jul 2022 14:50:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26VEoBJE017485; Sun, 31 Jul 2022 14:50:11 GMT (envelope-from git) Date: Sun, 31 Jul 2022 14:50:11 GMT Message-Id: <202207311450.26VEoBJE017485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 3e40d2cc61a0 - main - Fix for 548045b a too aggressive UFS superblock integrity check. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3e40d2cc61a00a7d69e99b0fda4040cd1df04c57 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659279012; 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=unKtHoJngiHfpoZ742w12AlDgOSXhbUH4x71auzOU3s=; b=gBRSNsxxCR+RiJ4SI62HBmjRmNHyqUHaVApQ5oJi/6RDjT6ccVbr4oeVeFS77PL9mf+FEj BwE9lSdGdoCVlE79WexmPu6umGUMzlig4aGvjBgVzTlIACd4asWUNfJT2Dbn+6wSGH2YWS C/I1bdrD2K3AlWPqcF8VAVH5UlGusOLPzwhi44v7J5eHzond/1pHpGYG0I/we9HZd7wRqG TkchP/LVdHiTC9Q5cOe9aOtFvP3+QhTmU2mJv4rwyb+6d4eU5PIEP5UtQnoOqvguHc2jm3 KRFlbecjzFCgkTQ2bLtnY5A0/4WwuKkHYvpKM99zdcVjUoFESLuFu86tCtw6Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659279012; a=rsa-sha256; cv=none; b=WK9Q5j4cN3Mbb4iwAEp8sUlxWsktkX3lAyaGfceiMFx2MChHmq0qwfHRg1BSNXMEilp/ct 7QqMF8OqJeLLWFYPwElP5f+qodFXPnZ/iF/K1F5FKCPIovOw48CleLuDCHcTWL4/2DPRh7 pEO34LUmb1QRz4Jzp1rx9LiDjpAWjJa9vP6IxXdR9glltVe3g5Im+AQ2Yv10OX7IqCinRi aCUU7gF3ZwjpTvjsFB0GpSFfqXP6WEnkQNnkqCwlEy+l/uOH1pofL9AllvzDAA06HOfyvz uWyQvUaZw+2MVfDPjeTeAvToEWqEoBsgS66dLeb7sQJn+SO+SV2ur2DCd+m9TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=3e40d2cc61a00a7d69e99b0fda4040cd1df04c57 commit 3e40d2cc61a00a7d69e99b0fda4040cd1df04c57 Author: Kirk McKusick AuthorDate: 2022-07-31 14:48:59 +0000 Commit: Kirk McKusick CommitDate: 2022-07-31 14:49:50 +0000 Fix for 548045b a too aggressive UFS superblock integrity check. Reported by: Jenkins --- sys/ufs/ffs/ffs_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 611f1989e8f9..90e7034e65a5 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -415,7 +415,7 @@ validate_sblock(struct fs *fs, int flags) CHK(fs->fs_ipg * fs->fs_ncg, >, (((int64_t)(1)) << 32) - INOPB(fs), %jd); CHK(fs->fs_sblockloc, <, 0, %jd); - CHK(fs->fs_sblockloc, >, fs->fs_fpg, %jd); + CHK(fs->fs_sblockloc, >, dbtob(fs->fs_fpg), %jd); CHK(fs->fs_sbsize, >, SBLOCKSIZE, %jd); CHK(fs->fs_maxbsize, <, fs->fs_bsize, %jd); CHK(powerof2(fs->fs_maxbsize), ==, 0, %jd);