From nobody Tue Mar 28 22:50:49 2023 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 4PmPzY3Khsz42Y2j; Tue, 28 Mar 2023 22:50:49 +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 4PmPzY2vlpz3MFX; Tue, 28 Mar 2023 22:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680043849; 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=nI6sZ9JLYJ7WSKYT76sXyiD20ChK/d/rTV+RhWpv5uU=; b=XX5ROyb0Ol0H1zXx3pdddswnPDqm7TEDbdJbFa0B3xB5+tozFvPhpfr+FCZNP04aGVgLeI D+3ZHf7ZMnjZ79fF3/xksF/XJFuLhaH4DFNzkG77FOUB7VLxBj9gAjr+4QwvhWCLw2U+Xm WxwdEG1kXZ07AgAZu0suSBv0IF7ilSUfH+a5ce4lj1j1WepWCeFH3uLcNAGvFpnwyAMsdm oeAUi6RNx3Jgz7gZc13X+wOSOpSdLYNzyDBUes8v0L41dfRAzPNgFjahXEnLmBoN08m66o cSAqNHQi4a3/z2p8h4I421WToHfabygKaWhPrsuQIpDC/mHz1ckCvhKdp4/DFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680043849; 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=nI6sZ9JLYJ7WSKYT76sXyiD20ChK/d/rTV+RhWpv5uU=; b=JprcwAPWq9Fsu5Y3q2KmYa2Pq3AQB8DfD4qG2nKq+ft2hWpu62MW5iq7eLtT3l2MYaPQEL uOdGdo/1f9Zuhu6ZUYeKfHz+ZXO4Y4e9tZGdo2mGe/+pS/E2ltgmqeIRIvRlS7gttXZjsX HlOI/Sa1bzc3tgjd+48dermmI2kbOduIFjhLWqgLpnRRTxC8MVg85ogzr6GrHGsfZPYA81 rnt6t1NESDYDUT9mrYn/LiFZztw37hKW6pJCJbubXB0AzDtobMeBgtd3kr58Q7yJb5lT1m BF7rmjUqUgnbT+nyhRNemy5dO9gWXq4GB8GBNm5iI5TNGVka/orimDz3kiKhxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680043849; a=rsa-sha256; cv=none; b=dYj+2t9+zQfweSQZmqZ9PVceqXEoMmXeqC1g9CvVOBducAWwdHCcH7XAyFWgrKNRTSxITy gJlbWBoz7SNOMuTgyqVV2zUV9/fX1vb3NWQFUUA40puul2ebvNhFU8fg5Gq3TT/ctbLrjH 52mnd7cWvc6FYufH2qi92LrlWu9IsonQhS7eqO/4QW47FCNfudeQyLkELfCZ9iRkINb+az H1wCUfOkzt/vpg9oQnmpgPR9d8nRnzDMxPf7h4XJGYANxxVtpQGg8SHZJUalYqFt496W7B TPGSpqB/c9NA/YQSWSMqMPZZSPjS8V3+DVf2roFqGJ866v5f1NFoyWu0jf2iwg== 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 4PmPzY1zSXz1L21; Tue, 28 Mar 2023 22:50:49 +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 32SMon1E057436; Tue, 28 Mar 2023 22:50:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SMonEg057435; Tue, 28 Mar 2023 22:50:49 GMT (envelope-from git) Date: Tue, 28 Mar 2023 22:50:49 GMT Message-Id: <202303282250.32SMonEg057435@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: bfd32571efc7 - stable/13 - Updates to UFS/FFS superblock integrity checks when reading a superblock. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bfd32571efc73fdb7f0614dd94f86402680983b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=bfd32571efc73fdb7f0614dd94f86402680983b3 commit bfd32571efc73fdb7f0614dd94f86402680983b3 Author: Kirk McKusick AuthorDate: 2023-03-28 22:49:49 +0000 Commit: Kirk McKusick CommitDate: 2023-03-28 22:50:38 +0000 Updates to UFS/FFS superblock integrity checks when reading a superblock. Back out MFC commit 4660b60a00c3120ddecd94b3f308d39bcb6d085a as it has had reported problems. --- sys/ufs/ffs/ffs_subr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 2f69965aba7e..d847373a8cde 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -446,7 +446,6 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_old_cgoffset, <, 0, %jd); CHK2(fs->fs_old_cgoffset, >, 0, ~fs->fs_old_cgmask, <, 0, %jd); CHK(fs->fs_old_cgoffset * (~fs->fs_old_cgmask), >, fs->fs_fpg, %jd); - CHK(CGSIZE(fs), >, fs->fs_bsize, %jd); /* * If anything has failed up to this point, it is usafe to proceed * as checks below may divide by zero or make other fatal calculations.