From nobody Fri May 19 23:54:23 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 4QNNwv5VPjz4CWtR; Fri, 19 May 2023 23:54:23 +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 4QNNwv4w5mz3v25; Fri, 19 May 2023 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540463; 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=tiTSLKIZLo8IWoOiHodQq7RyO6ByM8+GbngFfQlaEFw=; b=Mdr8LHLKFXQQKwskEtN+Szaq6aJJ/c49OVrMiXY4tGtsfiZ8iaZXDA7XGLTqMaer6iJ0QZ +c0VumooIwEFH4j3RSecD9SB3Bac2D9ZeuiL/fkoSpA7c+aB1auv8ozQcggdPK+8VTVGJ9 /oIeiR766b4plTq15uSTSUYI22zBa3cBsH3A3v7pG3wC8MwLGKso8DghO2ro0y2Hkib1iG xwkIrClog65xjVaUFVhj1e5oV+cx+Le5+rm6RafEJ3/ToypfBTCoa07cz3kVJI5nwfjTLk TXopiq4edUArdi7ekM1mErHgm2KF4Fl9E+uU+VLmGJ/8ejtNxMnmOgw4kcoQww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540463; 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=tiTSLKIZLo8IWoOiHodQq7RyO6ByM8+GbngFfQlaEFw=; b=j5RHsLfkl2/2RGn0dWFjVC46fuRqa1J1Mfng+UqjdgFXHV/XGjfg9bLx8gJWzIJeVwl97S k27i8vj0MDnkMMaKF6+hDaheDz/G51u04AiXdLFKBFeklu/YqZ0Y6UWjWBj94veWJ2ChCS l9Xvxd7++dO5T5DRQLSVZ1bXkhIq5jpcFoZOL6aRq+DkWODWW+c4ySAVOOLjXvtWHACj2F dqbrndZZjedOQxbKCLiAdXAIBLf7xvA3aZemBJxHRnN4PgNS+9MOzfLTx9T8a/naOUQfsc 05IwQ1SPs9nZRY6xba7BsbZX7e+OTVUhPIi6EH8OxWY5dBQ77ppMqvIDlxM3ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684540463; a=rsa-sha256; cv=none; b=f3UtgQ+8ApDl80GOWQ3KBtMAlYdkoIPdfcQ1/gKVjNTf1lxLHFgqg4ISMtDbcV+atKq76A biPr8YFV9qPCg2e8LC9rSakjZqWe71fwRmEMACG6ywqKZHFIIyFQS80bNvr7Cg6gqxANIw nZ/WZ42z158D9xriKIn6sFVhjbLo8Wkr0YUxXIUAvgdxq3aoBtcXnRrG0mjSbVXYrn2Tja PlmyG/9O7l73b+6PO2QzUzDQbY7uNUdLqbzHQPJK/6lAZ77aZvaBJ3pp5u0oZhJzhbQ7n4 DXDNFEiKKVnvRPsAb4fgIIXWo7t8PhGh15I2udKg/72I5iDePpYtHB93/ZDuMA== 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 4QNNwv40P5znTj; Fri, 19 May 2023 23:54:23 +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 34JNsNMs064770; Fri, 19 May 2023 23:54:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JNsNlP064769; Fri, 19 May 2023 23:54:23 GMT (envelope-from git) Date: Fri, 19 May 2023 23:54:23 GMT Message-Id: <202305192354.34JNsNlP064769@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: 0fc13be84735 - stable/13 - Additional validity checking in newfs(8). 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: 0fc13be8473505e98e9103467fe363db627051e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=0fc13be8473505e98e9103467fe363db627051e1 commit 0fc13be8473505e98e9103467fe363db627051e1 Author: Kirk McKusick AuthorDate: 2023-04-29 19:49:50 +0000 Commit: Kirk McKusick CommitDate: 2023-05-19 22:43:37 +0000 Additional validity checking in newfs(8). (cherry picked from commit 62dc21b10731bdba26dafeb51640c2048a3344a0) --- sbin/newfs/mkfs.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 3d19fc88fd79..fa00445baea8 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -332,6 +332,7 @@ restart: * can put into each cylinder group. If this is too big, we reduce * the density until it fits. */ +retry: maxinum = (((int64_t)(1)) << 32) - INOPB(&sblock); minfragsperinode = 1 + fssize / maxinum; if (density == 0) { @@ -663,6 +664,21 @@ restart: pp->p_frag = sblock.fs_frag; pp->p_cpg = sblock.fs_fpg; } + /* + * This should NOT happen. If it does complain loudly and + * take evasive action. + */ + if ((int32_t)CGSIZE(&sblock) > sblock.fs_bsize) { + printf("INTERNAL ERROR: ipg %d, fpg %d, contigsumsize %d, ", + sblock.fs_ipg, sblock.fs_fpg, sblock.fs_contigsumsize); + printf("old_cpg %d, size_cg %jd, CGSIZE %jd\n", + sblock.fs_old_cpg, sizeof(struct cg), CGSIZE(&sblock)); + printf("Please file a FreeBSD bug report and include this " + "output\n"); + maxblkspercg = fragstoblks(&sblock, sblock.fs_fpg) - 1; + density = 0; + goto retry; + } } /*